working on analytics
Merge branch 'master' of https://github.com/andyxmai/pickup
analytics cleaned up