first commit
Merge branch 'master' of https://github.com/makersacademy/library

Conflicts:
	lib/controllers/main.rb
	views/home.erb
merge conficts