dimer with classical original labels
Merge branch 'master' of github.com:jonnyjohannes/qmmm

Conflicts:
	tip3/inputs/mini.charmm.inp
	tip3/pbs/submit.pbs
Merge branch 'master' of github.com:jonnyjohannes/qmmm

Conflicts:
	tip3/demon/err.sh
	tip3/inputs/mini.charmm.inp
	tip3/pbs/submit.pbs