new function added
Merge branch 'master' of https://github.com/GarrisonJ/CS300Project