markup and css
Merge pull request #1 from chenxsan/master

markup and css