Merge branch 'master' of https://github.com/BrightHalcyon/bookshop

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/BrightHalcyon/bookshop