test
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
new feature
HotFix
Merge branch 'hotfix/HotFix' into develop
Merge branch 'hotfix/HotFix'
Merge branch 'feature/NewFeature' into develop
Merge branch 'develop'