Fixing parser...
Merge branch 'master' into FixingParser
updating things
Merge branch 'master' into FixingParser
fixin stuff
Merge branch 'FixingParser'

Conflicts:
	engine.cpp
	levels/defaultlevel

Merging again, hopefully i didnt break anything