Fix to 2Y axis button appearing
Merge pull request #36 from RyanMG/master

Fix to 2Y axis button appearing
Merge branch 'master' of https://github.com/Datsy/front-end
Clearing cart resets chart type to line chart
Merge pull request #37 from RyanMG/master

Clearing cart resets chart type to line chart
added images to landing page
Merge pull request #38 from RyanMG/master

added images to landing page
Commit before merge
Merge branch 'master' of https://github.com/Datsy/front-end

Conflicts:
	public/javascript/views/visualization/ChartView.js
	resources/coffeescript/views/visualization/ChartView.coffee