Fixade små buggar
Merge branch 'master' of https://github.com/kayson/killitwithfire

Conflicts:
	source/levelset/ImplicitFunctions.h
	source/presets/firePresetsTwoDimension.h