first commit
Initial commit
Merge branch 'master' of https://github.com/CrouseMatthew/sitstayfit
second commit
merge conflict