Added bounce to scroll view
Added constant for beenHere key
Merge remote-tracking branch 'github/master'