Getting rid of unecessary directory
Merge remote-tracking branch 'origin/Login-page-'
i don't know what all these commits are cuz i didn't do anything
Revert "i don't know what all these commits are cuz i didn't do anything"

This reverts commit 28d7485217b434f7e72612d9ee8beb5860e22915.
Added Java docs
Binary Files Differ
Got rid of the useless directory again...
nothing good
Merge branch 'master' into Item-Pages

Conflicts:
	Where_sMyStuff/Where'sMyStuff/bin/Where'sMyStuff.apk
	Where_sMyStuff/Where'sMyStuff/bin/classes.dex
	Where_sMyStuff/Where'sMyStuff/bin/classes/edu/gatech/TriggerHappyCoders/MainActivity$1.class
	Where_sMyStuff/Where'sMyStuff/bin/classes/edu/gatech/TriggerHappyCoders/MainActivity$2.class
	Where_sMyStuff/Where'sMyStuff/bin/classes/edu/gatech/TriggerHappyCoders/MainActivity$3.class
	Where_sMyStuff/Where'sMyStuff/bin/classes/edu/gatech/TriggerHappyCoders/MainActivity.class
	Where_sMyStuff/Where'sMyStuff/bin/classes/edu/gatech/User/User.class
	Where_sMyStuff/Where'sMyStuff/bin/classes/edu/gatech/User/UserCollection.class
	Where_sMyStuff/Where'sMyStuff/bin/dexedLibs/android-support-v4-ef97002ad499c035f25e6d4abaf08643.jar
	Where_sMyStuff/Where'sMyStuff/bin/resources.ap_
	Where_sMyStuff/Where'sMyStuff/src/edu/gatech/TriggerHappyCoders/LoginActivity.java