initial commit from nitrous
Merge branch 'master' of https://github.com/jrotolo/bookworm
"i hope im not beaking this"
Merge remote-tracking branch 'origin/one-branch-to-rule-them-all'
"merging into master after completing following user feature"
its making me do this
trying to merge into master
fixing merge conflicts
Searching and showing books now works