fixing for has secure password
fixing merge conflicts
database schema/models done
created models and migrations
deleted bishays
deleted stray word file