Undo Finished!! FINALLY!!! -Ye

Timer is also done.
Merge branch 'staging.branch' of https://github.com/huntercsteam7/capstonexue into staging.branch

Conflicts:
	Xue/gen/com/MeadowEast/xue/R.java
	Xue/src/com/MeadowEast/xue/LearnActivity.java