Initial working build
Merge branch 'master' of https://github.com/dashu2410/Counter-android-app

Conflicts:
	.gitignore