default level MJ fix
Merge branch 'master' of https://github.com/cortega2/MJBakingQuest
Update on default level
hotfix for the engine + healthbar
Merge branch 'master' of https://github.com/cortega2/MJBakingQuest
Merge branch 'FixingParser'

Conflicts:
	engine.cpp
	levels/defaultlevel

Merging again, hopefully i didnt break anything
blocks move and fall

also fixed a weird bug where mj would walk trough blocks...
i think