Changed main to detect whether the instance of the program will be a Server or a Client
Fixed Merge Conflict - Someone pushed some of my deleted methods back to master and i had to delete them again
Merge branch 'master' of https://github.com/Sy4z/The-Excellent-Adventure