Fixing conflicts.
Added some code for RSS reader.
Reverting to working state.
Merge branch 'master' of https://github.com/mastash3ff/Group-Project.git

Conflicts:
	GroupProject/AndroidManifest.xml
	GroupProject/bin/AndroidManifest.xml
	GroupProject/bin/GroupProject.apk
	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/resources.ap_
	GroupProject/res/values/strings.xml