feature 1 first commit
Merge branch 'feature1'

Conflicts:
	index.txt