commit
Merge branch 'master' of https://github.com/YolandaMDavis/howdoi

Conflicts:
	js/renderCharts.js