:q!
Merge branch 'createserver'

Conflicts:
	server.js
	views/index.jade

qqqqqqq:q