all
Merge branch 'master' of heroku.com:desolate-sierra-8486

Conflicts:
	server.js