Initial commit
[SETUP] Starting django project. competition app.
[UPDATE] added intial models
[UPDATE] linked db to settings.py
[UPDATE] added competition as installed app
[UPDATE] fixed the models and setting up db links
[ADD] added admin.py to get the admin to register the models
[ADD] added admin.py to get the admin to register the models
[UPDATE] added __unicode__ methods for models so that they look nicer
[UPDATE] changed the unicode method again. added order for models.
adding a venues table to the database
Adding a venues table to the database
[UPDATE] changed the naming and ordering of models
[UPDATE] fixed the str method so it actually returns a string for pairs. added gitignore file
Adding venues to the admin view
Merge branch 'master' of github.com:thisisaurelia/uct-maths

Conflicts:
	uctMaths/competition/__init__.pyc
	uctMaths/competition/admin.pyc
	uctMaths/competition/models.pyc
	uctMaths/uctMaths/__init__.pyc
	uctMaths/uctMaths/settings.pyc
	uctMaths/uctMaths/urls.pyc
	uctMaths/uctMaths/wsgi.pyc
[UPDATE] tiny things
Merge branch 'master' of github.com:thisisaurelia/uct-maths
[UPDATE] changing venues model and links and things
committing before pulling