adding socket to package
sockets are in, about to test them
trying new things with sockets
Merge branch 'master' into watchDatabase

Conflicts:
	app/client/js/controllers/index-controller.js
it seems to be working locally.. i think it should work on deploy as well, but i can't be sure.
fix to the multiple attendee pushes issues
removed timer to refresh map every x seconds, change limit of suggested restaurants to 10
Merge pull request #162 from nfeliciano/watchDatabase

Watch database
refreshes the map after 2.5 seconds
Merge branch 'master' into splashpage