finished scene one
Merge branch 'develop' of https://github.com/jed833/gateway into develop