Merge branch 'develop' of https://github.com/Team-H/gateway into develop
scenes 2, 3, and 4 initial pixel art complete
Merge branch 'develop' of https://github.com/Team-H/gateway into develop
scene 5 pixel art
Merge pull request #172 from beccannlittle/develop

scene 3 and 4 pixel art completed
scene 6
Merge pull request #177 from beccannlittle/develop

scene 6
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