first commit
first commit
nothing
Merge remote-tracking branch 'upstream/master'
favorite books page added
Ensure current user is book owner
Add video URL to allowed params
Merge pull request #53 from cndreisbach/book-owner

Ensure current user is book owner
Merge pull request #54 from cndreisbach/fix-videos

Add video URL to allowed params
Add indexes to books
Merge pull request #49 from ChetCorey/master

Favorite Books Page
Quit including all JS and CSS
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/books/_form.html.slim
	app/views/layouts/application.html.slim