latest changes
Merge branch 'master' of https://github.com/wedgieedward/TrackerDash