Collllisions.
Merge branch 'master' of github.com:esenti/labshooter

Conflicts:
	src/Entities/Player.cpp
	src/Entity.cpp