base pages updated
Merge branch 'master' of https://github.com/Sassafrass6/cs373-idb