ok
Merge branch 'dev' of http://github.com/leochen4891/DataVizClassProject into dev
Merge branch 'dev' of http://github.com/leochen4891/DataVizClassProject into dev

Conflicts:
	WebContent/Status.js
temp
a
no zeros in sum
Merge branch 'dev' into hong_dev
Merge branch 'dev' of http://github.com/leochen4891/DataVizClassProject into dev
Merge branch 'dev' into hong_dev
no zeros
add ppt
time chart size fix
finished for the presentation
Merge remote-tracking branch 'origin/lei_dev' into dev
Merge remote-tracking branch 'origin/dev'
ppt updated