Add cbgrandslam folder
Add manage.py
Changes in settings.py
Merge remote-tracking branch 'origin/master'
Add game folder