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

Conflicts:
	Jam/Jam/Jam.vcxproj
	Jam/Jam/Jam.vcxproj.filters
Entities
Merge branch 'Elias'
Entities
Hej
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam
Merge branch 'Elias'
game
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian

Conflicts:
	Jam/Jam/main.cpp
apa