app.js -> server.js
Merge branch 'master' of https://github.com/Happyness/nodescrabble

Conflicts:
	package.json
	server.js
	views/index.jade