First commit
Merge https://github.com/thezendguy/toiltracker