asdfsdf
Merge branch 'master' of https://github.com/dustookk/find-me.git

Conflicts:
	bin/FindMe.apk
	bin/classes.dex
	bin/classes/com/gdg/findme/HomeActivity.class
	bin/classes/com/gdg/findme/R$string.class
	bin/classes/com/gdg/findme/R$style.class
	bin/resources.ap_
	gen/com/gdg/findme/R.java
	res/layout/fragment_main.xml
	res/values/strings.xml