explore working
Merging master branch with camera branch
profile adds and reads settings
Login and NewMember updates username pref. PrefsActivity refreshes userinfo
fixed force close on prefsActivity
Profile now properly refreshes after changing settings
Displays User Images correctly
single picture working
deleted bin & gen
Displays User Images correctly
Displays User Images correctly
Displays User Images correctly
Explore/Profile linking to SinglePhoto works
Explore/Profile linking to SinglePhoto works
added delete
Login/New User functional

They do not give errors upon incorrect inputs, but they do not allow
the user to continue except with valid inputs
Fixed bug with new user creation

Before a person could create a new user with the same username as long
as the password was different. Now they cannot
code we showed the TA
single_picture
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes.dex
	bin/classes/android/support/v7/gridlayout/R$dimen.class
	bin/classes/android/support/v7/gridlayout/R$id.class
	bin/classes/com/example/ucrinstagram/Camera.class
	bin/classes/com/example/ucrinstagram/Explore.class
	bin/classes/com/example/ucrinstagram/HomeScreen.class
	bin/classes/com/example/ucrinstagram/Login.class
	bin/classes/com/example/ucrinstagram/NewMember.class
	bin/classes/com/example/ucrinstagram/Profile.class
	bin/classes/com/example/ucrinstagram/R$attr.class
	bin/classes/com/example/ucrinstagram/R$dimen.class
	bin/classes/com/example/ucrinstagram/R$drawable.class
	bin/classes/com/example/ucrinstagram/R$id.class
	bin/classes/com/example/ucrinstagram/R$layout.class
	bin/classes/com/example/ucrinstagram/R$menu.class
	bin/classes/com/example/ucrinstagram/R$string.class
	bin/classes/com/example/ucrinstagram/R$style.class
	bin/classes/com/example/ucrinstagram/R$styleable.class
	bin/classes/com/example/ucrinstagram/R.class
	bin/classes/com/example/ucrinstagram/Signup_Login.class
	bin/dexedLibs/gridlayout_v7-7d8676b692df6cacfa7fff785c8bd7bb.jar
	bin/resources.ap_
	gen/android/support/v7/gridlayout/R.java
	gen/com/example/ucrinstagram/R.java
	src/com/example/ucrinstagram/Login.java
	src/com/example/ucrinstagram/NewMember.java
	src/com/example/ucrinstagram/PrefsActivity.java
	src/com/example/ucrinstagram/Profile.java