models.py
Merge branch 'master' of ssh://github.com/willametteuniversity/webcirc2

Conflicts:
	website/models.py