not email for  username.
Merge branch 'master' of https://github.com/madakralc/DAT076.git