Buying Merchants, now with more functionality!
Merge branch 'master' of github.com:twostars/snoxd-koserver