Fixed spelling error
Merge remote-tracking branch 'origin/master' into Timer
Merge pull request #37 from GroupDenseKitchen/Timer

Simple duration timer, working
change of video file,,,
Merge remote-tracking branch 'origin/master' into Tracking

Conflicts:
	conf/dense_conf.yml