changes to test
Merge branch 'master' into branch-test-1
agh
Merge branch 'branch-test-1'
testing branching
Merge branch 'ltolias'
initial models
Merge branch 'master' into ccweaver

Conflicts:
	test
Merge branch 'ltolias'
no changes
Merge branch 'ccweaver'

Conflicts:
	test
no changes
syncing
Merge branch 'ltolias'

Conflicts:
	web/roommeet/people/models.pyc
merge
Merge branch 'ltolias'
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 'ltolias'

Conflicts:
	web/roommeet/roommeet/urls.pyc
	web/roommeet/roommeet/views.pyc
Merge branch 'ltolias'