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

Conflicts:
	AndroidManifest.xml