type error
Merge branch 'master' of github.com:Championzb/TenniSoda

Conflicts:
	TenniSoda/settings.pyc
	TenniSoda/urls.pyc
	TenniSoda/wsgi.pyc
	account/admin.pyc
	account/models.py
	account/models.pyc
	account/urls.pyc
	account/views.pyc
	city/__init__.pyc
	city/admin.pyc
	city/models.pyc
	court/__init__.pyc
	court/admin.pyc
	court/models.pyc
	game/__init__.pyc
	game/admin.pyc
	game/models.pyc
	logs/django_request.log
	logs/mylog.log
	notification/admin.pyc
	notification/models.pyc
	templates/base.html
Merge branch 'master' of github.com:Championzb/TenniSoda

Conflicts:
	TenniSoda/settings.pyc
	TenniSoda/urls.pyc
	TenniSoda/wsgi.pyc
	account/admin.pyc
	account/models.pyc
	account/urls.pyc
	account/views.pyc
	city/__init__.pyc
	city/admin.pyc
	city/models.pyc
	court/__init__.pyc
	court/admin.pyc
	court/models.pyc
	game/__init__.pyc
	game/admin.pyc
	game/models.pyc
	notification/admin.pyc
	notification/models.pyc