Updated master file.
Merge branch 'hotfix/Hotfix' into develop
Merge branch 'develop' of https://github.com/jefffarkas/git-flow-example into feature/Feature