Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
more things to find
making it so that the inventory activity has an up button that returns the user to the main activity
new launcher icon and app name
Merge remote-tracking branch 'upstream/master'
fixed?
trying again
Merge pull request #15 from snorham/master

giving the inventory activity an up button that returns user to the main activity
maybe fixed
Merge pull request #14 from ajbtee/master

Try this one