Till Malin

Fungerande version
Till Malin

Fungerande version
Merge branch 'master' of https://github.com/Enfisk/suit-em-up

Conflicts:
	SuitEmUp/SuitEmUp/CollisionManager.cpp