q6 done
Merge branch 'master' of https://github.com/austinshyu/hog

Conflicts:
	hog.py