Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath
Scrolling works
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath
Fixed header errors