w
temp commit for rearrange index.html
add untracked files
rearrange asset files
fix folding list
scrape analytis.js add
Merge local branch 'master' into develop/ han
change .gitignore file
update register form, add several plugin for effects
Merge branch 'develop' of https://github.com/tzuhan/organ-donation into develop

* 'develop' of https://github.com/tzuhan/organ-donation:
  change .gitignore file
fix ladda source
add ladda
add register tab
題目欄更新
Merge branch 'develop' of https://github.com/tzuhan/organ-donation into develop

* 'develop' of https://github.com/tzuhan/organ-donation:
  fix ladda source
  update register form, add several plugin for effects
  change .gitignore file
  scrape analytis.js add

Conflicts:
	app/views/welcome/index.html.erb
Merge branch 'develop' of https://github.com/tzuhan/organ-donation into develop

* 'develop' of https://github.com/tzuhan/organ-donation:
  題目欄更新
clean up html format
右邊小鐵人+一些CSS bug修復
add register controller, polish register tab ui
move Tinman side tab
Merge branch 'develop' of https://github.com/tzuhan/organ-donation into develop

* 'develop' of https://github.com/tzuhan/organ-donation:
  右邊小鐵人+一些CSS bug修復

Conflicts:
	app/views/welcome/index.html.erb