more changes blarg
Merge branch 'master' of https://github.com/ndrewniklas/ProgAssgmnt1.git