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

Conflicts:
	match_up/home/models.pyc
	match_up/home/views.pyc