pulled from master, made change. still ok?
changed spacing
commiting again...
merge conflict fixed
Merge pull request #8 from nairys/login_partial

Login partial