Commit
Merge branch 'master' of https://github.com/sophorsk/macathon

Conflicts:
	server/server.js