study activity basic logic stuff...
Merge https://github.com/nikwolfe7/clap

Conflicts:
	bin/LanguageProject.apk
	bin/classes.dex
	bin/classes/com/clap/LessonDialog$ReturnButton.class
	bin/classes/com/clap/LessonDialog$StudyButton.class
	bin/classes/com/clap/LessonDialog.class
	bin/resources.ap_
	src/com/clap/LessonDialog.java
Merge https://github.com/nikwolfe7/clap

Conflicts:
	bin/LanguageProject.apk
	bin/classes.dex
	bin/classes/com/clap/ClapDatabase.class
	bin/classes/com/example/languageproject/R$drawable.class
	bin/classes/com/example/languageproject/R$id.class
	bin/classes/com/example/languageproject/R$layout.class
	bin/classes/com/example/languageproject/R$menu.class
	bin/classes/com/example/languageproject/R$string.class
	bin/classes/com/example/languageproject/R$style.class
	bin/resources.ap_
	res/layout/list.xml