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

Conflicts:
	app/js/controllers.js