Merge remote-tracking branch 'upstream/develop' into develop
changed to String for Danny boy
Merge pull request #10 from neoemonk/develop

String change
Merge remote-tracking branch 'golden/develop' into develop