joined two authentication methods into one
Merge branch 'master' of https://github.com/djsuprin/Yakoder