merging with upstream
Merge remote-tracking branch 'upstream/master' into new-exercise-form
merge with upstream master
merge with master
change routing on exercise create
fix routing
Merge pull request #61 from ahardy55/layout-walkthrough

Layout walkthrough
merging