Attempt to Fix GIT fuckup

GIT is fucked up.
Try to fix GIT Fuckup

GIT is fucked up
Fix GIT fuckup

Eclipse merge. Full of rage….
Merge branch 'master' of https://github.com/localtoast9001/MinecraftPlugins

Conflicts:
	.gitignore