deleted showed settings activities and everything associated with it
Merge branch 'master' of https://github.com/dcstone09/TrueCheetah