switch actions
cards
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	src/Game.cpp