Merge branch 'master' into ccweaver
heroku struggles
requirements
requirements
more heroku
Merge branch 'master' into ccweaver
merge
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	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
,
heroku again
heroku
heroku
heroku
heroku
heroku
heroku db
l
added popups to markers and fixed csrf token problem
Merge branch 'ltolias'

Conflicts:
	web/roommeet/roommeet/urls.pyc
	web/roommeet/roommeet/views.pyc
updatees