update a few things
Merge branch 'master' of http://github.com/ClydeByrdIII/cs190lab7