fixed hotfix
Merge branch 'develop'
testing merge conflict
testing merge
Merge branch 'develop'

Conflicts:
	test.txt
Merge branch 'master' into develop