second attempt at log
Merge branch 'master' of github.com:seanlarge/Workoutlog2