ignore vlfeat
revising chaining
Merge branch 'master' into dev-tommy

Conflicts:
	.gitignore
revise chaining