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

Conflicts:
	web/roommeet/people/models.pyc
merge