really fixing scrolling etc
Merge branch 'master' of https://github.com/kylemcdonald/socialroulette.net