Beggining to get menu done
Merge branch 'master' of https://github.com/bliu34/Gompers-Acoustic-Team

Conflicts:
	src/edu/asu/acousticsystem/GestureActivity.java