ii
Merge branch 'master' of https://github.com/akandra/md_tian

Conflicts:
	md_init.f90