JUnits folder
Began database, added javadoc template for Olivia -Tim
Added the database, have BARELY begun to integrate. -Tim
fixed naming from previous
Added in functunality to user profile. Pre-database update
The database works, all that is still needed is to host online so it
isn't dependant on the app.
Merge remote-tracking branch 'origin/cory4'

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/resources.ap_
	WheresMyStuff/src/com/example/wheresmystuff/view/UserProfileActivity.java
Branch Peters
Merge branch 'petersPseudo'

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/resources.ap_
	WheresMyStuff/src/com/example/wheresmystuff/presenter/WheresMyStuff.java
	WheresMyStuff/src/com/example/wheresmystuff/view/SearchMenuActivity.java
tim
with this code i cant get it to crash
started integrating database changes
Initial matching implementation
JUnit Test Framework