Merge branch 'master' of https://github.com/jamalomartin/ComicBook-Inventory-App

Conflicts:
	README.md