fixed issue 26
Merge branch 'master' of github.com:danzajdband/hackdash