Database
Merge branch 'master' of github.com:weshack/rideshare

Conflicts:
	db.sqlite3
Updated create account function.