removing .project?
Merge branch 'master' of ssh://git@github.com/graysadler/gvod.git

Conflicts:
	.project