Fixing page 7.
merging in conc conflicts
Merge branch 'master' of github.com:ku-fpg/paper-sunroof-tfp13