Douchy commit of ALL the things so I can use my other laptop.
Merge branch 'master' of https://github.com/NoxDineen/chronosapp