change 2 on feature 2
Merge branch 'feature1'

* feature1:
  change 2 on feature 2

Conflicts:
	index.html