test
Merge branch 'master' of https://github.com/And7s/MolSim

Conflicts:
	src/MolSim.cpp
	src/Particle.h