Fixed floor traps, added trap rooms.
Merge branch 'master' of github.com:dbordak/mailcraft

Merged shit.