Merge pull request #24 from kostya-viktorov/master

Maps Present (Sort Of)
fixed DB crap, commented out map stuff.
Merge pull request #11 from praccu/master

Updating