Add Home Logic
Merge branch 'master' of github.com:GeorgeSG/placify

Conflicts:
	public/js/map.js