Fixed everythingggggg. No seg faults. Collision works. Bullets need to die.
Merge branch 'master' of https://github.com/Buhndabah/ShiverMeTimbers

Conflicts:
	gridElement.cpp
	mapManager.cpp