test
Merge branch 'master' of https://github.com/philippeseil/ljmd-f

Conflicts:
	src/ljmd.f90