done with equation for now
Merge branch 'master' of https://github.com/sugarria/Dungeon-Secretary.git