deleted extraneous elements
added ember charts
Merge branch 'rewrite' into front-end

Conflicts:
	app/templates/survey.hbs