added express 1st
Merge branch 'master' of https://github.com/jasonzliu/answer

Conflicts:
	server.js