sync
Merge branch 'needs_fix' of github.com:jdery/Tic-Tac-Toe-2014 into needs_fix

Conflicts:
	app/javascripts/controllers/appControllers.js
BUG: fix asap