gitignore
Revert "gitignore"

This reverts commit f37aad14b1d8ce193ac868feb5a7c21a4e159fc3.
ok
...
ok
OKOK
Merge branch 'master' of https://github.com/TidyMaze/DistExec

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/DistExec/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml