fix for pattern and player patterns
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
menu options and menu image
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	src/DisplayManager.cpp
rename