fixed gui stuff at top of game
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
Revert "Merge branch 'needs_fix' of github.com:jdery/Tic-Tac-Toe-2014 into needs_fix"

This reverts commit 677be57f6f9cc99ebef03e0cf95becc720a8191e, reversing
changes made to 41d09f822c5f549985fbe537786286fc3fef7d49.
sync
merge fixed DON'T REVERT
Merge branch 'development' of https://github.com/jdery/Tic-Tac-Toe-2014 into development
sync
Merge branch 'development' of https://github.com/jdery/Tic-Tac-Toe-2014 into development