init
Merge branch 'master' of github.com:kyokomi/HelloAndroidWear

Conflicts:
	.gitignore