this is the incomplete application that was demoed in the screencast.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/users.pyc
	test/testusers.pyc