lol
Merge branch 'master' of https://github.com/jannickj/minecraftmod
Merge branch 'master' of https://github.com/jannickj/minecraftmod

Conflicts:
	forge/mcp/eclipse/Minecraft/.project