reapply .gitignore
regenerate R file
Merge branch 'QuizCeption' into ActivityRewrite

Conflicts:
	bin/ClipVidva.apk
	bin/classes.dex
	bin/classes/com/example/clipvidva/CategoriesListAdapter.class
	bin/classes/com/example/clipvidva/CategoryListActivity$CategoryItemClickListener.class
	bin/classes/com/example/clipvidva/CategoryListActivity.class
	bin/classes/com/example/clipvidva/ItemDetailFragment.class
	bin/classes/com/example/clipvidva/R$attr.class
	bin/classes/com/example/clipvidva/R$color.class
	bin/classes/com/example/clipvidva/R$dimen.class
	bin/classes/com/example/clipvidva/R$drawable.class
	bin/classes/com/example/clipvidva/R$id.class
	bin/classes/com/example/clipvidva/R$layout.class
	bin/classes/com/example/clipvidva/R$menu.class
	bin/classes/com/example/clipvidva/R$string.class
	bin/classes/com/example/clipvidva/R$style.class
	bin/classes/com/example/clipvidva/R.class
	bin/classes/com/example/clipvidva/Splash.class
	bin/classes/com/example/clipvidva/SubjectListActivity$SubjectItemClickListener.class
	bin/classes/com/example/clipvidva/SubjectListActivity.class
	bin/classes/com/example/clipvidva/SubjectListAdapter.class
	bin/classes/com/example/clipvidva/VideoListActivity.class
	bin/classes/com/example/clipvidva/VideoListFragment.class
	bin/classes/com/example/clipvidva/VideoViewer.class
	bin/classes/com/example/clipvidva/quizzes/QuizCategoryListActivity.class
	bin/classes/com/example/clipvidva/quizzes/QuizItemDetailActivity.class
	bin/classes/com/example/clipvidva/quizzes/QuizSubjectListActivity.class
	bin/classes/com/example/clipvidva/quizzes/QuizSubjectListFragment.class
	bin/resources.ap_
	gen/com/example/clipvidva/R.java