sort books style
resolve conflicts
contact us page
Merge branch 'master' of https://github.com/BibAlex/bhl_rails