signup and login change

Signed-off-by: haddada <haddadaseif@gmail.com>
resolve conflict
Merge pull request #12 from haddada/master

signup and login change