fixed including path errors

Conflicts:
	.gitignore
switched to opencv 244