added user2.html
Merge origin/master