part 2 of test
part 1 of test
part 2 of test
Merge branch 'temp'

Conflicts:
	WheresMyStuff/src/com/example/wheresmystuff/LoginActivity.java
added files
Hopefully it now works.