Improved methods
fixed merge conflicts
Merge branch 'master' of https://github.com/mike-n-7/COMP303Project
Very basic stuff. Very much basic