Ändrade i getMax() och la till S i presets
Merge branch 'master' of https://github.com/kayson/killitwithfire

Conflicts:
	source/Grid.h
	source/VelocityField.cpp
	source/VelocityField.h
	source/fire.cpp
Fixar i advektionen
Merge branch 'master' of https://github.com/kayson/killitwithfire