deleted:    Notes.pdf
	modified:   README.md
加入add/delete
	modified:   app.rb
	new file:   public/jquery.min.js
	new file:   public/rails.js
	modified:   views/index.erb
	modified:   views/layout.erb
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  加入add/delete 	modified:   app.rb 	new file:   public/jquery.min.js 	new file:   public/rails.js 	modified:   views/index.erb 	modified:   views/layout.erb
  deleted:    Notes.pdf 	modified:   README.md

Conflicts:
	app.rb
	views/index.erb
	views/layout.erb