Beginning tidying up of code
Merge branch 'latestVersion'

Merging the updated GUI code into master
Deleted unnecessary gui class files
Added local files to resolve merge conflicts