Fixing issue with git
Merge branch 'development' of https://github.com/DadiuTeamOne/blue into development