Merge pull request #18 from mikewesthad/master

Cleaned up day seven code a little
Added class 7 notes, added stuff for class 8 and rearranged