search box
forgot your comma yo
more search box
change
Merge branch 'master' into btchen

Conflicts:
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/bootstrap/gmap.js
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc