second try
Merge branch 'master' of https://github.com/tarnelope/WorkoutLogRepo
Am i commiting the files now?