Merge branch 'search' of https://github.com/baobeihm/Library into baobeihm-search

Conflicts:
	app/views/readers/edit.html.erb

	modified:   .DS_Store
	modified:   app/views/readers/edit.html.erb
	modified:   app/views/readers/new.html.erb
	modified:   app/views/readers/show.html.erb
	modified:   app/views/staffs/.DS_Store
readme changed
Merge branch 'master' of github.com:weizhong612/Library

Conflicts:
	app/views/readers/edit.html.erb

	modified:   app/views/readers/edit.html.erb
modified:   app/views/readers/new.html.erb