Merge pull request #1 from seanmcmills/feature/feature-a

added file-b
add-file-c-to-hotfix-a
Merge pull request #4 from seanmcmills/hotfix/A

add-file-c-to-hotfix-a
Merge tag 'A' into develop

hotfix-finish-tag