Pulled .gitignore from master
Why do you keep being added?
Merge branch 'master' into opticalflow

Conflicts:
	.classpath