Fixes
Merge branch 'master' of https://github.com/ellern/champs-room.git