improved histograms
 fixed merge conflict
added js
getting off master branch
resolved merge conflicts in welcome.html and application.py