Ali's changes
Resolved conflicts
Conflic resolutions
Merge branch 'master' of https://github.com/jasonVenngo/mobilePerks