Develop branch
Please enter the commit message for your changes. Lines starting
Developer1 now
Developer2 now
Developer2 now2
develop2 now3
developer

Merge branch 'develop' of https://github.com/tagasouichiro/test_master into develop

Conflicts:
	test.txt
developer1 conflict
Merge branch 'develop' of https://github.com/tagasouichiro/test_master into develop
developer2 conflict

Please enter the commit message for your changes. Lines starting
Merge branch 'develop' of https://github.com/tagasouichiro/test_master into develop
test fixing