For passing through all the events for a particular user
indentation
Merge branch 'master' into query-creation

Conflicts:
	server.js