added user to DB
joshua stuff
merged joshua's code with mine
successfully merged joshua's code with mine