ozten/Roguelike — pull request #2 by Dinodog (2014-02-25 17:34:33+00:00)
Title: Resolving conflicts with the last merge

Resolving conflicts with the last merge