Working on the branches now
Merge branch 'feature/jacob' of https://github.com/Jacob-Laverty/CS321 into feature/jacob
Done