styling on login signup
merge conflict revolved
Merge pull request #41 from PAUCHOU/kevin2

merge conflict resolved