integrate changes
integrate changes
Merge branch 'master' of https://github.com/LeeHampton/group_project_1
Yes
fixing merge conflicts