added layouts
Ye's Merge
Merge branch 'staging.branch' of https://github.com/huntercsteam7/capstonexue into staging.branch

Conflicts:
	Xue/gen/com/MeadowEast/xue/R.java
	Xue/res/anim/bottom_to_top_slide.xml
	Xue/res/anim/left_to_righ_slide.xml
	Xue/res/anim/right_to_left_slide.xml
	Xue/src/com/MeadowEast/xue/LearnActivity.java
Anthony's Merge
Staging Commit -Ye
Commit to Ye.Branch for merge
Merge branch 'ye.branch' into staging.branch

Conflicts:
	Xue/.DS_Store
	Xue/res/.DS_Store
Anthony's merge
blah
Merge branch 'staging.branch' of https://github.com/huntercsteam7/capstonexue into staging.branch

Conflicts:
	Xue/res/layout/activity_update.xml
	Xue/res/layout/alert_card.xml
	Xue/res/raw/vocab.txt
	Xue/res/raw/xue_lp_background.ogg
	Xue/res/raw/xue_right.mp3
	Xue/res/raw/xue_wrong.mp3
	Xue/src/com/MeadowEast/xue/CardUpdater.java
	Xue/src/com/MeadowEast/xue/Common.java
	Xue/src/com/MeadowEast/xue/ListenerAwareAsyncTask.java
	Xue/src/com/MeadowEast/xue/NetworkManager.java
	Xue/src/com/MeadowEast/xue/SoundManager.java
.
Updated with timer done.
Merge branch 'staging.branch' of https://github.com/huntercsteam7/capstonexue into staging.branch

Conflicts:
	Xue/gen/com/MeadowEast/xue/R.java
	Xue/res/layout/activity_log.xml
	Xue/res/menu/log.xml
	Xue/res/values-sw600dp/dimens.xml
	Xue/res/values-sw720dp-land/dimens.xml
	Xue/res/values/dimens.xml
	Xue/src/com/MeadowEast/xue/LearnActivity.java
	Xue/src/com/MeadowEast/xue/LogActivity.java