fix some mistake and implementing new physic
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	damncute/Core/Core.cpp
	src/Actions/ActCardA.hh
	src/Actions/ActCardB.hh
	src/Player.hh