リファクタリング
ignore
p1
p1
p1
p1
Merge branch 'p1' of github.com:ichylinux/careerlife into p2

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	config/routes.rb