end screen controllers
working on controllers
working on inventory tests
removed duplicate test
Merge branch 'master' of git@github.com:tuturto/pyherc.git