Typo
Merge pull request #6 from jsjones27/UI_changes

Ui changes
Merge branch 'master' into inventory_add

Conflicts:
	android/src/com/example/kiss/AddItemActivity.java