Merge branch 'adasko' into devel

Conflicts:
	.gitignore

diff --cc .gitignore
index 918a787,d5615a4..abb3640
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,11 -1,6 +1,19 @@@
++<<<<<<< HEAD
 +# ignore compiled stuff
 +*.[oa]
 +
 +# ignore texteditors
 +*.swp
 +*~
 +
 +
 +# ifnore build dir
 +build/
++=======
+ ~.[ao]
+ gradcheck/
+ mapcheck/
+ run/
+ sympcheck/
++>>>>>>> adasko
  

diff --cc source/unres/src_MD/energy_p_new_barrier.F
Simple merge

diff --cc source/unres/src_MD/readrtns.F
Simple merge