asda
Merge branch 'master' into Elias

Conflicts:
	Jam/Jam/Editor.cpp
	Jam/Jam/data/levels/test.xml
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias

Conflicts:
	Jam/Jam/Ball.cpp
	Jam/Jam/Ball.h
	Jam/Jam/Game.cpp
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias
Hej
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias

Conflicts:
	Jam/Jam/EntityManager.cpp
Hej
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/Cat.cpp
	Jam/Jam/Game.cpp
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias

Conflicts:
	Jam/Jam/Game.cpp
Merge branch 'master' into Elias

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

Conflicts:
	Jam/Jam/Game.cpp
	Jam/Jam/data/levels/some_level.xml
Hej
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias
Hej
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias

Conflicts:
	Jam/Jam/Cat.cpp
	Jam/Jam/Game.cpp
	Jam/Jam/LooseEnd.cpp
Hej