progressed unit tests and models
fixed the merge issues
Merge branch 'master' of https://github.com/LaunchAcademy/celebrity_mugshot_review into kw_user_logs_out