updating controllers of this branch
Skrollr working but only top of page
merged chris and master together 10 20 Sat night
merged new work late sat night into my master