Taken care of erros and pep8
Merge branch 'develop' of https://github.com/hammadhaleem/fedora-college into develop

0a1bc.

Conflicts:
	fedora_college/core/models.py
Shit happens