updated stuff
Merge branch 'master' of https://github.com/Blsoll01/CIS411_Project