Saving stuff
Merge branch 'master' of github.com:joshcline002/fittrackr