Developer2 now
Developer2 now2
develop2 now3
developer

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

Conflicts:
	test.txt