Tambahin page login
Merge branch 'master' of https://github.com/tirtawr/android-pedometer

Conflicts:
	.classpath
	project.properties