Make it work after upgrading from Express 2 to 3
Merge branch 'no_more_coffee'

Conflicts:
	server.js