Detecting the position in TILES
left-right collision working!
Annoying Map Object
map array passed from map
Nvm this one
Merge remote-tracking branch 'origin/collision-map' into collision-map

Conflicts:
	RetardedGame/Player.cpp
	RetardedGame/x64/Debug/RetardedGame.log
	RetardedGame/x64/Debug/RetardedGame.tlog/CL.write.1.tlog
	RetardedGame/x64/Debug/vc120.idb
	RetardedGame/x64/Debug/vc120.pdb
	x64/Debug/RetardedGame.exe
	x64/Debug/RetardedGame.ilk
	x64/Debug/RetardedGame.pdb
Blabla
Revert "Blabla"

This reverts commit bd1b95be849c9c23fa8d7700e4874af6a37d592e.
Merge working :)
Ground-detection kinda working :joy:
top and bottom detection works properly
map collision merge