adding user.java to parseStarterProject
modifies User.java
needs help for persisting user data into cloud
Adds Item, Character classes, changes Puzzle class
adds trophies page, page displays all items collected by user (in string form). Still needs to persist user successfully
adds some conventional fixes
Updating PuzzleActivity (in progress)

Made several small changes to DiversityTest to make extra checks while
querying.
Updated Puzzle and MainMenu to account for User

for these to work we need the user class (or is it now person?) must
extend ParseUser
committing stuff
resolves merge conflicts
Gets rid of user wrapper class. Works directly with user class. Photo album and trophy shelf working minimally, displaying the current user's collectedItems and collectedCharacters
making puzzle more dynamic but was done already by jenn haha
merged Jennifer's stuff, but changed getCurrentUser for now since I can't find her code for User yet
Merge pull request #24 from syqnew/master

User can login and logout.
fixes User class
removes person.java
Merge pull request #28 from clc4/master

Removed useless Person.java
Delete .classpath~HEAD
Delete .classpath~upstream_master
Delete build.gradle~HEAD