Adding code from trackyourshit site
Merge branch 'master' of github.com:NinjaBranDizzle/trackyourshit