addToInventory
Merge branch 'master' of https://github.com/lfuelling/textie

Conflicts:
	Textie.java