Added modal for adding classes
Fixed merge problems
Merge branch 'master' of github.com:gitoffourlawn/daemondash