moar test
f
Merge branch 'master' into btchen

Conflicts:
	test
	web/roommeet/roommeet/__init__.pyc
	web/roommeet/roommeet/settings.pyc
	web/roommeet/roommeet/urls.pyc
	web/roommeet/roommeet/views.pyc
	web/roommeet/roommeet/wsgi.pyc
roommeet test
requirements
requirements
,
l
Merge branch 'master' into btchen

Conflicts:
	requirements.txt
	roommeet-1/roommeet/local_settings.py
	roommeet-1/roommeet/wsgi.pyc
	test
	web/roommeet/roommeet/__init__.pyc
	web/roommeet/roommeet/settings.pyc
	web/roommeet/roommeet/urls.pyc
	web/roommeet/roommeet/views.pyc
testing
Merge branch 'master' into btchen
Merge branch 'btchen' of https://github.com/dschen/roommeet into btchen

Conflicts:
	roommeet-1/django_cas/__init__.pyc
	roommeet-1/django_cas/middleware.pyc
	roommeet-1/django_cas/views.pyc
	roommeet-1/people/admin.pyc
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
pyc
Merge branch 'btchen' of https://github.com/dschen/roommeet into btchen

Conflicts:
	roommeet-1/django_cas/middleware.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