Merge branch 'master' of https://github.com/scain91/Uncommon-Books
Merge branch 'master' of https://github.com/scain91/Uncommon-Books

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/scain91/Uncommon-Books

Conflicts:
	.idea/workspace.xml