More changes.
Merge branch 'master' of https://github.com/TripleD13/CS283Project