Changes from class
minor things
Merge branch 'master' of https://github.com/Aaronneyer/EECS290_Project4