changes
Merge branch 'master' of http://github.com/missmoneypenny/gmu_library_project

Conflicts:
	library/app/controllers/users_controller.rb
	library/db/seeds.rb
changes to books controller and users controller