new updates master
c
Merge branch 'Italo's' of https://github.com/siketh/COP4331_Project into Italo's