better
Merge branch 'master' of github.com:Objelisks/learnthecod

Conflicts:
	server.js