refactored containers + including collision
Trees
Better
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame into Trees
First Collision implementation
Image resolution resizing
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame into Trees
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
Resolution fix that breaks more than it fixes.

Moet dit committen om van branch te wisselen.
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
Got rid of failed resolution stuff.
Some small fixes and comments