edited login
Merge branch 'master' of https://github.com/teamcleancode/ConferenceManager.git