Added tests etc.
Merge branch 'master' of github.com:FilipHarald/EpicLANProject