Gotta commit to merge some stuff
Merge branches 'master' and 'master' of https://github.com/JamesZinger/NgNode-Checkers
Gotta commit to merge some stuff
Merge branch 'master' of https://github.com/JamesZinger/NgNode-Checkers

Conflicts:
	app/server/Lobby/lobby.js