Merge pull request #5 from conorbrady/master

Done
Updated the application after doing some testing with the server, fixed several bugs
Perfect server that bit more perfect