refactored containers + including collision
First Collision implementation
Merge branch 'Collision_Behaviour_Temp' of https://github.com/PimV/Bermuda-TheGame into Collision_Behaviour

Conflicts:
	Bermuda/Bermuda/Bermuda.vcxproj
	Bermuda/Bermuda/Bermuda.vcxproj.filters
	Bermuda/Bermuda/MapLoader.cpp
	Bermuda/Bermuda/PlayState.cpp