Fix scrolling issue
Merge branch 'pikachu' of github.com:alicenguyen/hci-zleep_app into pikachu