commit to branch -small change
ScorCounter and MainActivity
ScoreCounter increment
1

1
1
Merge branch 'Empire_Rafik' into Mark

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/com/example/cs356/MainActivity$1.class
	bin/classes/com/example/cs356/MainActivity.class
	bin/classes/com/example/cs356/R$color.class
	bin/classes/com/example/cs356/R$dimen.class
	bin/classes/com/example/cs356/R$drawable.class
	bin/classes/com/example/cs356/R$id.class
	bin/classes/com/example/cs356/R$layout.class
	bin/classes/com/example/cs356/R$menu.class
	bin/classes/com/example/cs356/R$string.class
	bin/classes/com/example/cs356/R$style.class
	bin/classes/com/example/cs356/R.class
	bin/classes/com/example/cs356/ScoreCounter.class
	bin/classes/com/example/cs356/Scoreboard.class
	bin/classes/com/example/cs356/ScoreboardList.class
	bin/classes/com/example/cs356/SpecialCounter.class
	bin/resources.ap_
	gen/com/example/cs356/R.java
	res/layout/activity_dummy_tester.xml
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/example/cs356/MainActivity.java
	src/com/example/cs356/ScoreCounter.java
	src/com/example/cs356/Scoreboard.java
	src/com/example/cs356/ScoreboardList.java
	src/com/example/cs356/SpecialCounter.java