Update env.rb
リファクタリング
ignore
p1
bundle update
update
p3
p3
p1
p1
p2
p3
p1
Merge branch 'p1' of github.com:ichylinux/careerlife into p2

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	config/routes.rb
Merge branch 'p2' of github.com:ichylinux/careerlife into p3

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/top/index.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
p3
p3
Merge branch 'p3' of github.com:ichylinux/careerlife into p4

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/careers_controller.rb
	app/models/career.rb
	app/views/careers/_form.html.erb
	app/views/careers/index.html.erb
	app/views/careers/show.html.erb
	app/views/top/index.html.erb
	config/application.rb
	config/initializers/secret_token.rb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
	features/step_definitions/開発日記/2014-08-13.rb
	test/controllers/careers_controller_test.rb
	test/fixtures/careers.yml