Finishing Admin Backend
Merging
Tim
Nothing changed
Merge remote-tracking branch 'origin/Cory' -Tim

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity$UserLoginTask.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity.class
	WheresMyStuff/bin/resources.ap_
	WheresMyStuff/gen/com/example/wheresmystuff/R.java
Merge remote-tracking branch 'origin/peter' -Tim

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/classes/com/example/wheresmystuff/DonateItemActivity$1.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/FoundItemActivity$1.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity$UserLoginTask.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/User.class
	WheresMyStuff/bin/resources.ap_
	WheresMyStuff/gen/com/example/wheresmystuff/R.java
Switching branches and its making commit this, shouldnt change anything
Merge remote-tracking branch 'origin/Cory'

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity$1.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity.class
	WheresMyStuff/bin/resources.ap_
Merge remote-tracking branch 'origin/cory's'

Conflicts:
	WheresMyStuff/bin/classes/com/example/wheresmystuff/DonateItemActivity$1.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity$UserLoginTask.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/R$string.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/R$style.class
	WheresMyStuff/gen/com/example/wheresmystuff/R.java
Admin Menu STuff
Admin is now able to promote others
Added in unlock abillity-cory
Delete User Functionality
Nothing done, but commit to redo head branch as master
Small edits to user class. Forgot to switch to new branch, doing that
now.
Split lists into, found,lost,donated. Right now the app crashes when it
should go to the found item list and when you click donate