changed some titling text
Merge branch 'master' of https://github.com/cremalab/workshop
fixed the merge stuff