one line
Merge branch 'master' of https://github.com/SCZkid/hackMIT

Conflicts:
	server.js