commit
Merge branch 'master' of https://github.com/fourgates/CSE305Project
fixing error
Merge branch 'master' of https://github.com/fourgates/CSE305Project