pycs
pyc
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
houses!!!!
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/roommeet/views.pyc
Merge remote-tracking branch 'origin/mjd3'
housing
pyc
pyc
Merge remote-tracking branch 'origin/mjd3'
Merge branch 'master' of https://github.com/dschen/roommeet
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/settings.pyc
housetablefill added