Merge branch 'master', remote branch 'upstream/master'
removed js/dash.js
Merge pull request #20 from dklawren/master

removed js/dash.js