Merge branch 'master' of https://github.com/frecka/college4U

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/College4U.apk
	bin/classes/com/example/project3/InStateFragment.class
	bin/classes/com/example/project3/Login.class
	bin/classes/com/example/project3/NationalFragment.class
	bin/classes/com/example/project3/NewUser.class
	bin/classes/com/example/project3/SchoolDatabaseHandler.class
	bin/classes/com/example/project3/School_Listings.class
	res/layout/in_state_fragment.xml
	res/layout/national_fragment.xml
	src/com/example/project3/InStateFragment.java
	src/com/example/project3/NationalFragment.java
	src/com/example/project3/SchoolDatabaseHandler.java
	src/com/example/project3/School_Listings.java
Merge branch 'master' of https://github.com/frecka/college4U

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/College4U.apk
	bin/classes/com/example/project3/InStateFragment.class
	bin/classes/com/example/project3/Login.class
	bin/classes/com/example/project3/NationalFragment.class
	bin/classes/com/example/project3/NewUser.class
	bin/classes/com/example/project3/SchoolDatabaseHandler.class
	bin/classes/com/example/project3/School_Listings.class
	res/layout/in_state_fragment.xml
	res/layout/national_fragment.xml
	src/com/example/project3/InStateFragment.java
	src/com/example/project3/NationalFragment.java
	src/com/example/project3/SchoolDatabaseHandler.java
	src/com/example/project3/School_Listings.java
no message
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/College4U.apk
	bin/classes/com/example/project3/InStateFragment.class
	bin/classes/com/example/project3/Login.class
	bin/classes/com/example/project3/NationalFragment.class
	bin/classes/com/example/project3/NewUser.class
	bin/classes/com/example/project3/SchoolDatabaseHandler.class
	bin/classes/com/example/project3/School_Listings.class
	res/layout/in_state_fragment.xml
	src/com/example/project3/InStateFragment.java
	src/com/example/project3/NationalFragment.java
	src/com/example/project3/SchoolDatabaseHandler.java
	src/com/example/project3/School_Listings.java
Leaving the  bars as gray bars for more visibility while I think of something nicer

Weirdly enough this stuff below just appeared in the commit message section so be weary again:
Merge branch 'master' of https://github.com/frecka/college4U

Conflicts:
	bin/College4U.apk
	bin/classes/com/example/project3/R$drawable.class
	bin/classes/com/google/android/gms/R$drawable.class
	gen/com/google/android/gms/R.java