登録テスト用に変更
Merge branch 'master' of ssh://github.com/akiko74/dqx_items

Conflicts:
	app/controllers/application_controller.rb
Merge branch 'master' of ssh://github.com/akiko74/dqx_items
Merge branch 'master' of ssh://github.com/akiko74/dqx_items
Itemに金額を入れるフィールドを追加
Merge branch 'master' of ssh://github.com/akiko74/dqx_items