Some infrastructure
Merge branch 'master' of https://github.com/lazi3b0y/arena.git