(m)
Merge branch 'master' of github.com:WomenWhoCode/TicTacToe

Conflicts:
	app/views/games/new.html.erb
	spec/views/games_spec.rb
Merge pull request #11 from cowmanifestation/master

Merge branch 'master' of github.com:WomenWhoCode/TicTacToe