Fixed conflicts - 2
Merge pull request #1 from jsussman22/Scoopadoop-master

Merge updated pages
Merge pull request #4 from moegerc/master

Updated with moegerc code
Test

alri
Merge pull request #2 from jsussman22/master

Changes made during fork pull
Added anchors

Still working on making the writing neater
Updated sub pages
Merge pull request #5 from Scoopadoop/master

Added anchors
Links and tables

Made stuff look nicer
Merge pull request #6 from Scoopadoop/master

Links and tables
Merge pull request #3 from jsussman22/master

Changes made