Added menuactivity.java and menuactivity.xml as well as made a small
change to login
Added in a working menu, but I'm not done with it
no
no
All of Cory's Files that he did
Merge branch 'master' into CorysWork

So, I learned how to correctly do merges, and how to take cory's work
and turn it into a branch, and then merged the branches. that being
said... it was a pain to learn, so please dont break stuff until i can
explain to you how to fix...

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$2.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity$3.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity$4.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/bin/resources.ap_
	WheresMyStuff/gen/com/example/wheresmystuff/R.java
Cory's Files, hopefully correct
This has cory's part of files
Hopefully Im almost done with fixing this
Merge remote-tracking branch 'origin/CorysWork'

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/classes/com/example/wheresmystuff/MenuActivity$1.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/MenuActivity$2.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/MenuActivity$3.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/MenuActivity.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/R$id.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/R$layout.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/R$menu.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/R$string.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/R$style.class
	WheresMyStuff/bin/dexedLibs/android-support-v4-21e81c2ed103b3a4f6f464b024adcc15.jar
	WheresMyStuff/bin/resources.ap_
	WheresMyStuff/gen/com/example/wheresmystuff/R.java
	WheresMyStuff/res/menu/activity_menu.xml
	WheresMyStuff/res/values/strings.xml
	WheresMyStuff/src/com/example/wheresmystuff/MenuActivity.java