some progress on chart
Merge branch 'master' of https://github.com/moabe/meetingPlanner

Conflicts:
	js/views/dayView.js