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

Conflicts:
	roommeet-1/people/__init__.pyc
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/__init__.pyc
	roommeet-1/roommeet/wsgi.pyc
pyc
Merge branch 'master' of https://github.com/dschen/roommeet