Examples of how to proceed.

Not working...
Resolved conflicts
Merge branch 'master' of https://github.com/sanielfishawy/VideoHighlighter

Conflicts:
	bin/highlighter.rb
Examples of how to proceed