started testing
Merge branch 'master' of https://github.com/PederSchacht/nss-barter-town