Books coming in material design
Merge branch 'design/material' of github.com:unexceptednavyshower/oddly-back into design/material_books
Update login method
fix Merge conflict