Commit test4
Commit test4
Commit test5
Merge branch 'develop' of https://github.com/kawase/test_rep.git into develop

Conflicts:
	app/controllers/test_controller.rb