Added icon to the detail fragment
Its letting me merge Merge branch 'DetailEdits'
please work Merge branch 'master' of https://github.com/cdavis21/436-semester-project

Conflicts:
	bin/classes.dex
	bin/classes/com/worldstars/semesterproject436/MainActivity.class
	bin/classes/com/worldstars/semesterproject436/R$id.class
	bin/classes/com/worldstars/semesterproject436/R$layout.class
	bin/classes/com/worldstars/semesterproject436/R$menu.class
	bin/classes/com/worldstars/semesterproject436/R$string.class
	bin/resources.ap_
	bin/semesterProject436.apk
	gen/com/worldstars/semesterproject436/R.java