register and login pages created
fix merge
Merge pull request #3 from payam10/master

fixed merge conflict I think