#70 - duplicate whiteCards fix
Merge branch 'master' of https://github.com/marshallshen/mangos-to-mangos into feature/whiteCards
#70 - global variables
#70 - startgame break fix
#70 - filename typo
Merge pull request #74 from nhsieh/feature/whiteCards

#70 - duplicate whiteCards fix
Merge branch 'master' of https://github.com/marshallshen/mangos-to-mangos into feature/admin

Conflicts:
	client/templates/lobby.js