Updating pages
Merge branch 'master' of https://github.com/SStilson/CHAP2