Recipe/new途中まで
Merge branch 'master' of https://github.com/sekine126/wse2014

Conflicts:
	Gemfile.lock
	app/controllers/recipes_controller.rb
	app/views/recipes/new.html.erb
17:48
Merge branch 'master' of https://github.com/sekine126/wse2014
Merge branch 'master' of https://github.com/sekine126/wse2014
create.htmlの作成
Merge branch 'master' of https://github.com/sekine126/wse2014