Merge branch 'master' into btchen
fixing urls, requests
Merge branch 'btchen'

Conflicts:
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc
conflict resolution
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc