homepage close to done
fixed conflict

Conflicts:
	src/js/sunburst.js