Merge branch 'dev-add-text' into dev-hayley
dk
Merge branch 'dev' into dev-hayley
fixfix
Merge pull request #17 from stanmep/dev-hayley

Dev hayley