added inventory to main
Merge branch 'master' of https://github.com/Bekt/AmazonHackathon

Conflicts:
	AmazonHackathon/src/Inventory.java
	AmazonHackathon/src/Main.java