gem update
merge conflict
start on fixing the form where you add exercises to the workout