Merge branch 'master' into psuedo_master
added bargraph and updated somethings
Merge branch 'psuedo_master'