adding alert
Merge branch 'master' of https://github.com/myersb/Iris

Conflicts:
	Iris/InventoryDataHandler.m