comit befor merg
Merge branch 'master' of https://github.com/Epiphane/7DRL_2013
Implemented an active display, changed how actives are stored