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

Conflicts:
	js/Chart.js
fix bug
Finish Release-1