step 1
this was added by someone else
adding bacon
Merge branch 'feature/base' into develop
Added version number
Merge branch 'release/1.0'
Merge branch 'release/1.0' into develop
Fixed typo
Merge branch 'hotfix/hot-1' into develop
Merge branch 'hotfix/hot-1'
Made a sandwich
Merge branch 'release/1.1'