Merge pull request #1 from kbasma/katia_trying_to_fix_shit

Katia trying to fix shit
Creates Conditional Logic for user Authentication
Merge pull request #2 from kbasma/user_auth_logic

Creates Conditional Logic for user Authentication
Merge branch 'master' into katia_trying_to_fix_shit