just a few touch ups
Merge branch 'master' of https://github.com/thepro200/Team7Project