join team update
Merge branch 'master' of https://github.com/jags9415/big-race

Conflicts:
	src/server/server.js