Has NewsFeed.  Not working right now.  Gotta add some xml
Restored backup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	GroupProject/AndroidManifest.xml
	GroupProject/bin/AndroidManifest.xml
	GroupProject/bin/GroupProject.apk
	GroupProject/bin/classes.dex
	GroupProject/bin/classes/com/example/groupproject/MainActivity$1.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$2.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$3.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$4.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$5.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$6.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$7.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity.class
	GroupProject/bin/classes/com/example/groupproject/R$id.class
	GroupProject/bin/classes/com/example/groupproject/R$layout.class
	GroupProject/bin/classes/com/example/groupproject/R$menu.class
	GroupProject/bin/classes/com/example/groupproject/R$string.class
	GroupProject/bin/classes/com/example/groupproject/R$style.class
	GroupProject/bin/dexedLibs/android-support-v4-5909262409321f17eb49054d1943380f.jar
	GroupProject/bin/resources.ap_
	GroupProject/gen/com/example/groupproject/R.java
	GroupProject/res/layout/activity_news_feed.xml
	GroupProject/src/com/example/groupproject/MainActivity.java