mimi home
working on book template
Merge branch 'master' of github.com:elmoz/azbakeya1

Conflicts:
	app/views/layouts/application.html.erb
	app/views/layouts/library.html.erb
	app/views/library/index.html.erb
	config/routes.rb
	db/seeds.rb