fixed height for shitty firefox
try AGAIN to fix shitty firefox
add readings
Merge branch 'master' of cory.cs.berkeley.edu:~/sp14

* 'master' of cory.cs.berkeley.edu:~/sp14:
  fixed height for shitty firefox