Fixed stuff so it works
Merge branch 'master' of github.com:g33kette/tmtracker