Gitignore aangepast
Merge remote-tracking branch 'origin/master'

Conflicts:
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.log
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	forge-1.7.10-10.13.0.1180-src/eclipse/.metadata/version.ini