pep8
Merge branch 'master' of https://github.com/Goom11/uclaapi

Conflicts:
	models.py
Merge branch 'master' of https://github.com/Goom11/uclaapi
ayo, set up your virtualenv