Matt's Fixes
Merge branch 'master' of github.com:kloplop321/cs256
Merge branch 'master' of github.com:kloplop321/cs256