updates
Merge branch 'master' of https://github.com/CS254Project6/mainRepository
Merge branch 'master' of https://github.com/CS254Project6/mainRepository