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

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/project3/R$id.class
	bin/classes/com/example/project3/R$integer.class
	bin/classes/com/example/project3/R$layout.class
	bin/classes/com/example/project3/R$menu.class
	bin/classes/com/example/project3/R$string.class
	bin/classes/com/example/project3/R$style.class
	bin/classes/com/example/project3/R$styleable.class
	bin/classes/com/example/project3/Settings.class
	bin/dexedLibs/android-support-v4-66a82e25d67b0a92272ff5882b1f62b4.jar
	bin/dexedLibs/google-play-services_lib-16725c21b63bc8e0f216ff4562a59d4e.jar
	bin/resources.ap_
	gen/com/example/project3/R.java
	res/layout/national_fragment.xml
Merge remote-tracking branch 'origin/master'