my stuff`
Created a base.html, and a basic URL dispatcher
sutff
Merge branch 'master' of https://github.com/rickling/cards169
parsed cards against humanity cards and added method to create all cards in db
Merge branch 'master' of https://github.com/rickling/cards169
Updated the requirements for socketio, added html for socketio testing
Some incomplete code for reference
Merge conflicts fixed, added south to app