updated homework
Merge branch 'master' of https://github.com/sanielfishawy/VideoHighlighter

Conflicts:
doc/kon.txt
VI sucks!
Merge branch 'master' of https://github.com/sanielfishawy/VideoHighlighter

Conflicts:
	doc/kon.txt