Fixed naming mistake

Now attempting to sign up with an existing username won't return an
error.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.py
	database.pyc