commit view and controller files
Merge branch 'master' of github.com:taratatach/SnakeWords

Conflicts:
	app/models/game.rb