added
some
merged

Merge branch 'master' of https://github.com/normanyahq/TutorDisplayer

Conflicts:
	homework.db
modified