view(changed) mobile view modified
conflicts()
view(changed) login page
Merge pull request #13 from sunnyLA4/master

view(changed) mobile view modified