rollerderby generic map
Merge branch 'master' of https://github.com/ortegaguillermo/rollerderby.git