Merge pull request #36 from KittyTristy/working

Closed #6 and Other Stuff (Don't Merge Yet)
I'm stupid
Merge branch 'master' of github.com:KittyTristy/roguelike into working