Generalized inventory; added alignment enum; added TokenList
Merge pull request #33 from zcmoore/master

Generalized inventory; added alignment enum; added TokenList