Socket shit
Merge branch 'master' of github.com:jmagnusson/the-olumpics