Detecting user login
Merge server commits
Merge branch 'master' of https://github.com/Neo4JTweetUp/tweetUpServer

Conflicts:
	server.js