Changed simulation parameters; started commenting
Merge branch 'master' of https://github.com/happah-graphics/happah.git

Conflicts:
	happah/gui/forms/SimulationForm.cpp