Merge pull request #177 from beccannlittle/develop

scene 6
edited scenes and fixed dash
Merge branch 'develop' of https://github.com/Team-H/gateway into develop

Conflicts:
	gateway/static/sprites/scene2_init.xcf
	gateway/static/sprites/scene3_init.xcf
	gateway/static/sprites/scene4_init.xcf
	gateway/static/sprites/scene5_init.xcf
Merge pull request #178 from jed833/develop

edited scenes and fixed dash