lols
merge with master
Merge branch 'master' into Jesse
Merge branch 'william' into Jesse
Added Progress Report
Merge branch 'master' into Jesse

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