adding voice message
fixing conflicts
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013

Conflicts:
	src/com/example/spheroapp/MainActivity.java
Remove dead code