try to push to heroku, fail
Merge branch 'master' of github.com:lisafeather/silverFit
add activity model
Merge branch 'master' of github.com:lisafeather/silverFit