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
Player klasse overschreven
Filter gefixt
Map weggegooid
Nieuwe map
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame into Develop

Conflicts:
	Bermuda/Bermuda/Player.cpp
Fix
FPS aangezet
Force map overwrite (hopefully)
collision box berekening goed gemaakt

niet overschrijven bitches
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into Trees

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