Updates methods added
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1
Updates methods added