Revert deleted file in "merge"

This reverts commit 2e2f31498f6f8ee80350d4de47f8f402c8d90454.
Merge pull request #12 from njzk2/master

Revert deleted file in "merge"
Merge branch 'master' of github.com:qjcg/soundapp
updated buttons
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
#1 Save recorded files as .wav
Merge pull request #14 from njzk2/master

#1 Save recorded files as .wav
moved AudioService to "common" AndroidManifest
uncomment SoundFilterIntentService stuff
moved SoundFilterIntentService.java into common package
added SounfFilterIntentService-related stuff
fix SoundFilterIntentService path
update manifest
adding cute images fixes #13
Merge branch 'master' of github.com:qjcg/soundapp
imported log
using the image buttons