committing to pull new files
merge conflicts
skrollr added. some transitions added.