add sam.html
change title
change title again
add header
add my story
oil painting
add css
css files
ad yi.css
Merge branch 'yi' of github.com:yicaosh/dib-boot into yicaosh-yi

# By Cao
# Via Cao
* 'yi' of github.com:yicaosh/dib-boot:
  ad yi.css
  css files
  add css
  oil painting
  add my story
  add header
  change title again
  change title
  add sam.html

Conflicts:
	css/style.css