Well fixed things....
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1.git
Fixed things...