no message
Merge branch 'master' of github.com:kato-takashi/dotInstall

Conflicts:
	Rails4/taskapp/app/controllers/projects_controller.rb