added in new stuff
Merge branch 'master' of https://github.com/ayee5/SlugFitness