Index commit
Testing a small change
reseting index
Test 2
More Testing
Merge branch 'Inventory'

Conflicts:
	index.php