working on chart data
Merge branch 'master' of github.com:hwanud/SecureInfo

Conflicts:
	Chart/barTest.js
	background.js
	history.html