bugfixes
instructions
Merge commit '41b92ef7cdd13f592c4f892082b002911fda7016' into aaron_mac

Conflicts:
	src/Constants.h
	src/GameScreen.cpp
	src/MenuScreen.cpp
added max's audio