03-May-14
03-May-14
1:16PM


Quiz and Practice Set preliminary implementation in the previous commit.
Merge branch 'master' of ssh://git@github.com/wendell1991/Project321

Conflicts:
	MathEducator/AndroidManifest.xml
	MathEducator/res/layout/activity_quiz.xml
	MathEducator/res/layout/activity_selectpracticeset.xml
	MathEducator/res/layout/activity_settings.xml
	MathEducator/res/layout/coincoin_main.xml
	MathEducator/res/layout/ranking_tab.xml
	MathEducator/res/layout/xgame_main.xml
	MathEducator/res/layout/xgame_scoresheet.xml
	MathEducator/res/values/strings.xml
	MathEducator/src/com/mathtimeexplorer/coincoin/CoinCoin.java
	MathEducator/src/com/mathtimeexplorer/main/OptionActivity.java
	MathEducator/src/com/mathtimeexplorer/main/PracticeSetActivity.java
	MathEducator/src/com/mathtimeexplorer/misc/Constants.java
	MathEducator/src/com/mathtimeexplorer/misc/LoadAppActivity.java
	MathEducator/src/com/mathtimeexplorer/tutorials/Arithmetic.java
	MathEducator/src/com/mathtimeexplorer/worksheets/QuizActivity.java
	MathEducator/src/com/mathtimeexplorer/worksheets/QuizFragment.java
	MathEducator/src/com/mathtimeexplorer/xgame/XGame.java
03-May-14
1:30 PM


Quiz and Practice Set preliminary implementation