Added logout
Merge branch 'corys'

Conflicts:
	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/gen/com/example/wheresmystuff/R.java