Cleaned up for merge

Close #111
Merge branch 'feature/tracking' of https://github.com/jackjonesfashion/JJ-CSS into feature/tracking