commit for develop branch
commit for dev branch 2
Merge branch 'master' into develop

Conflicts:
	Test2/test
first merged
Merge branch 'develop'

Conflicts:
	Test2/test