Began myQuestion activity/xml
Merge remote-tracking branch 'origin/master'

Conflicts:

	F14T07-Application/bin/classes/com/example/f14t07_application/R$id.class

	F14T07-Application/bin/classes/com/example/f14t07_application/R$layout.class

	F14T07-Application/bin/classes/com/example/f14t07_application/R$menu.class

	F14T07-Application/bin/classes/com/example/f14t07_application/R$string.class

	F14T07-Application/bin/classes/com/example/f14t07_application/R$style.class
	F14T07-Application/gen/com/example/f14t07_application/R.java
	F14T07-Application/res/values/strings.xml