server up and running
Merge branch 'master' of https://github.com/juliusba/wilfred