extract hog
Merge branch 'master' of github.com:JohannesJungbluth/mmg-project

Conflicts:
	.gitignore
	MultimediaProjekt/ImgPre.cpp