swap color's fail fixed
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
zeu commit fatiguay
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	damncute/Menu.hh