update gemfile
Merge branch 'master' of http://github.com/weizhong612/Library
Merge branch 'master' of http://github.com/weizhong612/Library
pull from master
Merge branch 'master' of http://github.com/weizhong612/Library
merge from remote
Merge branch 'master' of http://github.com/weizhong612/Library

Conflicts:
	app/views/readers/index.html.erb
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
layout configuration. add bootstrap in GEMFILE. Modified layout for index/home/login pages