Fixed bug, I think
Merge branch 'master' of https://github.com/projectteam5/Project1.git
Fixed bugs, I think