Changed variables to .socket
Populating problem in comment when gameStarts
3rd argument for watcher
Changed variables to .socket
Merge branch 'gameStart' into dev

Conflicts:
	public/scripts/controllers/game.js
	public/views/game.html
Added problem model and sending it back to client
Watcher sockets are now working
Changed variables to .socket
Populating problem in comment when gameStarts
3rd argument for watcher
Changed variables to .socket
Merge pull request #28 from alexmckenley/dev

Correctly include sandbox from github
Merge branch 'gameStart' into dev

Conflicts:
	public/scripts/controllers/game.js
	public/views/game.html
Fixed bug with sending problem to client
Added problem model and sending it back to client
Merge branch 'server' into dev

Conflicts:
	app/sockets.js
	test/populateChallenges.js
Merge pull request #29 from malucky/dev

Sending problem to clients when both players are ready
Merging refactors
Merge pull request #30 from deini/dev

Preparing for watcher