Delete .classpath~HEAD
Delete .classpath~upstream_master
Delete build.gradle~HEAD
Delete build.gradle~upstream_master
Delete old User.java
Delete old .classpath
Delete old .project
Delete old .gitignore
Delete jenn.txt
Code cleanup and tested app.
Delete psuedoservercode.py
Merge pull request #29 from syqnew/master

Code cleanup and tested app.
adds inventory and anagram activity/view
resolves merge conflicts
Merge pull request #30 from clc4/master

Adds inventory and anagram view/activity
doing some small thing to merge
Pushing settings up