feature 1  step 1
feature 1 step 2
Finish Feature-1

Conflicts:
	js/Chart.js