commit before merge
Merge branch 'master' of https://github.com/kvmohyi/fluid-simulation-project

Conflicts:
	simulation.cpp