added user.html and user.css
Merge remote-tracking branch 'origin/master'