moved a comment. whee.
Merge branch 'master' of https://github.com/sharpau/CS533-Final
fixed so many bugs