w
一大堆CSS by Yo
change UI
merge
repush
merge develop with Yo
merge remotes develop and Yo
style.css button change
CSS微調
CSS微調
Merge branch 'Yo' of https://github.com/tzuhan/organ-donation into Yo

* 'Yo' of https://github.com/tzuhan/organ-donation:
  style.css button change
  merge remotes develop and Yo
  change UI
  update images, change tin man container to left
  adjest tinmanbox
  smooth scroll
  text-dec none, story troll
  fix register_index.js
  missing semi coloum
  change cover.jpg
  register css

Conflicts:
	app/assets/stylesheets/style.css
add story tab title
some css may have problems
Merge branch 'develop' into Yo

* develop:
  add story tab title
  story expand
  add story 1
  shift mail feature
  add chart.js
  add 3 d3 chart
  add d3 lib

Conflicts:
	app/assets/javascripts/welcome_index.js
	app/assets/stylesheets/style.css
	app/views/welcome/index.html.erb
fix story