Update env.rb
リファクタリング
ignore
p1
bundle update
update
p4
p3
p3
p4
p1
p1
p2
p3
p4
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