- User resgistration and login works now
Merge remote-tracking branch 'upstream/master'
Fixed merge conflicts

Conflicts:
	app/db.sqlite3
Merge pull request #13 from lsxliron/master

Fixed merge conflicts