added Android .gitignore (from github/gitignore)
Removing .idea
Merge branch 'master' of github.com:qjcg/soundapp
ignoring generated files and .idea

http://stackoverflow.com/questions/16736856/what-should-be-in-my-gitignore-for-an-android-studio-project
Merge pull request #11 from njzk2/master

Merge audio records
Merge pull request #12 from njzk2/master

Revert deleted file in "merge"
ignoring .iml
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