Deleted a bunch of stuff and changed some styles
Merge branch 'sidescroll' into philip-2014