Revert "git being weird"

This reverts commit 1730ef467f95670162db50b7682bd707930b84d6.

Conflicts:
	.classpath
	.gitignore