jquery filepush
Merge branch 'master' of https://github.com/osdc/graphHack
Merge branch 'master' of https://github.com/osdc/graphHack
Merge branch 'master' of https://github.com/osdc/graphHack
test run
added chart.js
Merge branch 'master' of https://github.com/osdc/graphHack

Conflicts:
	index.html
	main.js
Merge branch 'master' of https://github.com/osdc/graphHack
final resolved