Jamie todo collision map
Merge branch 'master' of github.com:DavidTruby/Sanguine

Conflicts:
	src/MainEntity.cpp
collisisons changed
MainEntity -> Map
compiling
collision detection reimplemented, hopefully
Physics, ish
Added ds_store thingy.
Merge branch 'master' of github.com:DavidTruby/Sanguine
Merge branch 'collisions'
fixed update stuff.