ignore file update .idea and database.yml
user remodeled
merged
user model username tested
Merge branch 'master' of https://github.com/itedd/itedd