update everything
merge
update gitignore
upddate models, user login works