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
updated hub, progressreport, quiz, main, result, quiz.pp
Merge branch 'william' of github.com:JesseJugnoo/Lazy_Scholar into william