Commit Test 1
Commit test2
Commit test3
Commit test4
Commit test4
Commit test5
Update test_controller.rb

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

Conflicts:
	app/controllers/test_controller.rb
Merge pull request #1 from kawase/develop

Develop