Merge branch 'ccweaver'
fixing get marks bug
pyc
pyc
pyc
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/roommeet/templates/base.html
	roommeet-1/roommeet/urls.pyc
filters update text accordingly
Merge branch 'ccweaver'

Conflicts:
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
pycs
Merge branch 'ccweaver'

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

Conflicts:
	roommeet-1/roommeet/forms.pyc
date overlap text change
fixed
pyc
talk table caption
save button active tab
something
none