server1.0
Geolocation
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife
got the server.js up
got the database to work
got the databaseMerge branch 'master' of https://github.com/arikalfus/OperationNightlife
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife

Conflicts:
	index.html
Merge branch 'master' into ari-build_framework

Conflicts:
	js/main.js
	server.js