First commit.
Merge branch 'master' of https://github.com/apereverzin/WhereAreYou

Conflicts:
	.gitignore