none
houses!!!!
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!!!!
more house stuff
Merge remote-tracking branch 'origin/mjd3'
pyc
pyc
makin the cursor do good stuff when it hovers over links
Merge remote-tracking branch 'origin/mjd3'
Merge branch 'master' of https://github.com/dschen/roommeet
pyc
first time login requires profile completion
meet bug
pyc
Merge branch 'btchen'

Conflicts:
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc
Merge branch 'master' into btchen