accidentally committed a swap file... sorry
Database settings are set
Locale in settings and Heroku setup
removed sdjango.py from the sdjango application
removed sdjango.py from directory
Merge branch 'master' of github.com:hellochar/the_game_bazaar
Settings fixed and pushing to heroku
Changed namespace to /chat
A little bit of tab conversion
started proof of concept code for lobby
Merge branch 'master' of github.com:hellochar/the_game_bazaar
Simplify saving/loading procedures
Merged with map-editor branch
Merged map-editor
Merge branch 'master' into map-editor
Add updated editor