Fix for firefix
Merge branch 'master' of https://github.com/Ambrosys/molecular_dynamics_js

Conflicts:
	Makefile