リファクタリング
Rails-4.0.9
リファクタリング
Rails-4.0.9
Rails-4.0.9
Rails-4.0.9
Rails-4.0.9
p3
Merge branch 'p3' of github.com:ichylinux/careerlife into p4

Conflicts:
	app/controllers/careers_controller.rb
	app/views/careers/_form.html.erb
	app/views/careers/edit.html.erb
	app/views/careers/index.html.erb
	app/views/careers/new.html.erb
	app/views/careers/show.html.erb
	db/migrate/20140823050444_create_careers.rb
	db/schema.rb
	features/step_definitions/開発日記/2014-08-23.rb
	features/仕様書/01.トップページ.feature
	features/仕様書/02.キャリア.feature
	features/開発日記/2014-08-23.feature