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
Update .gitignore

Trying to make merging easier
Deleted the bin files for easier merging
Merge branch 'master' of https://github.com/GoogleJump/Diversity

Conflicts:
	ParseStarterProject/AndroidManifest.xml
	ParseStarterProject/gen/com/parse/starter/R.java
	ParseStarterProject/res/values/strings.xml
	ParseStarterProject/src/com/parse/starter/Material.java