changed gui to be larger
Merge branches 'master' and 'master' of https://github.com/rc2811/Web_App

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/web_app/HomeScreenActivity.class
	bin/classes/com/example/web_app/MessagingActivity.class
	bin/classes/com/example/web_app/MyFamilyActivity.class
	bin/classes/com/example/web_app/PickerActivity.class
	bin/classes/com/example/web_app/QuizActivity.class
	bin/classes/com/example/web_app/QuizStartActivity.class
	bin/classes/com/example/web_app/R$id.class
	bin/classes/com/example/web_app/R$layout.class
	bin/classes/com/example/web_app/R$menu.class
	bin/classes/com/example/web_app/R$string.class
	bin/classes/com/example/web_app/R$style.class
	bin/classes/com/example/web_app/R$styleable.class
	bin/classes/com/example/web_app/R$xml.class
	bin/classes/com/example/web_app/SelectionFragment.class
	bin/classes/com/example/web_app/SettingsActivity.class
	bin/classes/com/example/web_app/SlideshowActivity.class
	bin/classes/com/example/web_app/TestSuiteActivity.class
	bin/classes/com/facebook/android/R$id.class
	bin/resources.ap_
	gen/com/example/web_app/R.java
	gen/com/facebook/android/R.java
	res/layout/activity_messaging.xml
	res/layout/activity_register.xml
	src/com/example/web_app/MessagingActivity.java