fix error 001
Merge branch 'hotfix-001'
Merge tag 'hotfix-001' into develop

merge hotfix-001
start work on feature 1
made a change to fileAddedAsFirstInDevelopBranch.txt
Merge branch 'feature-001' into develop