basic signup
Merge branch 'master' into signup

Conflicts:
	db.sqlite3
Merge pull request #1 from ablikexe/signup

basic signup