second try to incorporate charts
Merge branch 'master' of https://github.com/edgarw19/discussionMeteor

Conflicts:
	Charts/testchart.html
Merge branch 'master' of https://github.com/edgarw19/discussionMeteor