add feature1
Finish Feature-1
add feature 2
Finish Feature-2

Conflicts:
	index.php
Merge branch 'develop'