GitIgnore Update
Framework
Framework
adasd
Merge branch 'master' of https://github.com/KoffiePatje/CommandEdit

Conflicts:
	build/built-jar.properties
	build/classes/plugin.yml
	files/plugin.yml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/nl/pleduc/mc/CommandEdit/CommandEditListener.java