trying to fix github
syncing
removed tutorial stuff, renamed things to make more sense
Merge branch 'ltolias'

Conflicts:
	web/roommeet/people/models.pyc
merge
lots of new features
Merge branch 'ltolias'
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
Merge branch 'master' into ccweaver