Commit before pull upstream
Merge branch 'master' of https://github.com/Datsy/front-end
Merge branch 'master' of https://github.com/Datsy/front-end
Change data format to be consistent
Merge branch 'charts'
Change line opacity to make charts more readable
Merge branch 'master' of https://github.com/Datsy/front-end
Sorting out issue with x-value data
Merge branch 'master' of https://github.com/Datsy/front-end
Add filler image to landing page
New vis data model
Merge branch 'master' of https://github.com/Datsy/front-end

Conflicts:
	public/javascript/views/visualization/ChartView.js
	resources/coffeescript/views/visualization/ChartView.coffee
Merge pull request #32 from collenjones/master

Rework code to parse Data for D3
Merge branch 'master' of https://github.com/Datsy/front-end

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