first commit
Merge branch 'master' of github.com:wasnot/AndroidWear-Test

Conflicts:
	.gitignore