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