Add more chinese characters
Adding more characters
New Assets and qml changes to use them
Format qml files with proper indentation
More qml formatting changes
Even more QML changes
-Made some fixes with the timing accuracy using the phone
Re-introduce the Dictionary
"updated quiz"
Merge branch 'master' into william

Conflicts:
	assets/Quiz.qml
Re-introduce Fade
Quiz is added, it tells user if it was wrong or right
Images are updated with white background removed
Merge branch 'master' into william
quiz.qml is updated
"quiz" updated, and "test" database updated, took out long names that screw up the button because its too long
adfes
Merge branch 'master' into Jesse

Conflicts:
	assets/Hub.qml
	assets/Quiz.qml
	assets/lazy_scholar.sqlite
	src/LazyScholar.cpp
	src/quiz.cpp