Added the rest of the stuff I said I added in the last commit -_-
Merge branch 'master' of github.com:sarahwitty/dotatrack