fixing
committingMerge branch 'master' of github.com:bartschelfhout/hackathon

Conflicts:
	server.js