単語の編集ダイアログを表示
Merge branch 'master' of github-ktachibana:hamackathon/wordgame
gamefieldを/geme/:idに移動
Merge branch 'master' of github-ktachibana:hamackathon/wordgame

Conflicts:
	config/routes.rb
Hexに単語を入力できるようにした
Merge branch 'master' of github-ktachibana:hamackathon/wordgame