Initial commit
Merge branch 'master' of https://github.com/yuruga/androidwearhackathon08 into develop

Conflicts:
	.gitignore