updata master merge weijie
modify index.html.erb
update and merge the new code
add some css and js