I have no idea what this was :/
Merge branch 'master' of https://github.com/karizon/ratslap-server

Conflicts:
	server.js