updates
Merge branch 'master' into changes
Merge pull request #23 from ClassicallyGeek/paladinPatty

updated the way <code> elements are displayed, a few tweaks still needed
updates
Updates galore
assignments
Merge pull request #24 from ClassicallyGeek/changes

Changes
merge with master
changes for patty's stuff