First commit
Merge branch 'master' of https://github.com/bertop89/geosocial

Conflicts:
	.gitignore