hotfix
feature 1 modified in hotfix
feature1 modified
Merge branch 'hotfix'

Conflicts:
	feature1.txt
Addet a new feature