Layout changes
Merge branch 'master' of https://github.com/matthewlkey/iothack2014

* 'master' of https://github.com/matthewlkey/iothack2014:
  initial timing code when scrolling up and down
Layout changes