added max's audio
Merge commit 'e5a3008232e92bf6194b5b97cc457d296f435eab' into aaron_mac

Conflicts:
	src/MenuScreen.cpp