untracked files on master: cdcc069 small changes in HOG.cpp
index on master: cdcc069 small changes in HOG.cpp
WIP on master: cdcc069 small changes in HOG.cpp
Merge commit '866dc799405bd30524d2db94ae707bad1ac296b9'

Conflicts:
	MultimediaProjekt/Main.cpp