Merge pull request #5 from dschen/master

Merge branch 'master' into dschen
Merge branch 'ltolias'
Merge pull request #6 from dschen/dschen

Merge pull request #5 from dschen/master
error
Merge branch 'ltolias'
started implementing CAS

It's not working yet--import errors or something
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
fix
fix
fixed remove button talk page
fix
Merge branch 'master' into ltolias