more stuff
Merge branch 'master' of https://github.com/SuperStarGamesNetwork/IronManMod

Conflicts:
	forge/mcp/src/minecraft/william/mods/testmod/common/Testmod.java