Demo Scene

Added demo scene for saturday by merging our two scenes, fixed most of
the mess that came out of that.