changes to scrolling.
Merge branch 'master' of https://github.com/barret-anspach/artifacttech2
disabled scrolling - fixed sizing issues. beware the grunt file on building - you might have to clear the parse/public directory.