Merge branch 'ccweaver'
Merge branch 'master' into ltolias
changed map scroll
Merge branch 'master' into ltolias
procfile change
well, that didn't work...
Merge pull request #5 from dschen/master

Merge branch 'master' into dschen
marker title html store fix
Merge branch 'ltolias'
Merge pull request #6 from dschen/dschen

Merge pull request #5 from dschen/master
add remove contacts on meet page
error
error
Merge branch 'ltolias'
started implementing CAS

It's not working yet--import errors or something
remove buttons on talk page-still broken
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
fix
fix
fixed remove button talk page