alex updated school db
Merge remote-tracking branch 'brandon/master'

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
Update national_fragment.xml
Update in_state_fragment.xml
Merge remote-tracking branch 'FatDinosaur/master'

Conflicts:
	res/layout/in_state_fragment.xml
	res/layout/national_fragment.xml
no message
ALright, in theory this should fix the stuff for all y'alls