working on implementing phone - wear communication
Merge branch 'master' of github.com:qjcg/soundapp

Conflicts:
	wear/src/main/AndroidManifest.xml
	wear/src/main/java/soundapp/com/hackathon/soundapp/soundapp/MainActivity.java