Updated for startup weekend
Merge branch 'master' of github.com:timd/sheffieldgeeks