adding to the pile of commits.
Merge branch 'master' of github.com:shiftf8/cs536
now i'm finished.