First commit
Merge branch 'master' of https://github.com/tankwalker/infovis
Some changes on laptop
Merge branch 'master' of https://github.com/tankwalker/infovis

Conflicts:
	js/charts.js~
	js/feedback.js~
Merge branch 'master' of https://github.com/tankwalker/infovis

Conflicts:
	css/style.css
Improved bar selection