server..
Merge branch 'master' of github.com:kiwiwearables/nicout