Basic leaflet map (and commented out Instagram/Sockets)
Merge branch 'master' into serversockets

Conflicts:
	app/views/partials/main.html
Merge pull request #17 from tcb-hr/serversockets

Basic leaflet map (and commented out Instagram/Sockets)