Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
making it so that the inventory activity has an up button that returns the user to the main activity
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from snorham/master

giving the inventory activity an up button that returns user to the main activity