merge master into chris lots of changes
migrate and seed db on chris
Skrollr running almost all the way down and css background gradient is back
cutout beer pints on top of bubbles
fixing merge conflicts and pushing