Hej
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias

Conflicts:
	Jam/Jam/data/levels/level_1.xml
lvl1
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian

Conflicts:
	Jam/Jam/data/levels/level_1.xml
banor
banor