inventory activity
added nav buttons
changed import
merged
conflicts
am conflict
merged
android manifest
merge
Merge pull request #23 from 3olcin/master

merge please
Added nav buttons to inventory layout
Merge pull request #24 from 3olcin/master

Added nav buttons to inventory layout
no changes?
Merge branch 'master' of https://github.com/3olcin/CIS4340_VirtualPet

Conflicts:
	AndroidManifest.xml
Removed tabbed
Merge pull request #25 from 3olcin/master

Removed tabbed
added strings resources for buttons
Merge pull request #26 from 3olcin/master

added strings resources for buttons
Login Adjustments
Added onclicklisteners for buttons in PetActivity