Merge branch 'master' of https://github.com/Icydemon/McPlugins
Merge branch 'master' of https://github.com/Icydemon/McPlugins

Conflicts:
	src/mcplugin/test/git/main.java