Merge branch 'lee' into develop
Merge branch 'lee' into develop
edit usage
Remove yaml from Gemfile
Merge branch 'develop' into lee