cleaned
Merge branch 'master' of https://github.com/evan-jacques/cs307-matchup

Conflicts:
	match_up/auth/__init__.pyc
	match_up/auth/models.pyc
	match_up/auth/views.pyc
	match_up/confirm/__init__.pyc
	match_up/confirm/models.pyc
	match_up/confirm/views.pyc
	match_up/home/__init__.pyc
	match_up/home/models.pyc
	match_up/match_up/__init__.pyc
	match_up/match_up/settings.pyc
	match_up/match_up/urls.pyc
	match_up/rankings/views.pyc