fixing for has secure password
fixing merge conflicts
database schema/models done
Merge pull request #3 from CoolJorcz/building-models

Building models and migrations