Merge branch 'storypage'
Merge branch 'storypage'
Merge branch 'storypage'
Merge branch 'storypage'
Merge branch 'storypage'
Merge branch 'storypage'
Fixes medium-sized display (vertical kiosk)
Merge branch 'background_video'
Merge branch 'master' into background_video
Merge pull request #7 from ashleybot/background_video

Background video