Added grade field
Select for grade in classes (but disable school select for now)
Fixed adduser
JK settings
Merge branch 'master' of https://github.com/garrettdreyfus/Block
Fixed adding users
Ignore pyc
don't store pyc files in git
my settings file
Merge branch 'master' of https://github.com/garrettdreyfus/Block

Conflicts:
	.gitignore
	System/__init__.pyc
	System/models.pyc
	crush/__init__.pyc
	crush/models.pyc
	crush/urls.pyc
	crush/views.py
	crush/views.pyc
	crushrank/__init__.pyc
	crushrank/settings.pyc
	crushrank/urls.pyc
	crushrank/wsgi.pyc
Resolved conflict