Merge branch 'master' of https://github.com/ironhammer354/SteamTech

Conflicts:
	CREDITS-fml.txt
	LICENSE-fml.txt
	MinecraftForge-Credits.txt
	MinecraftForge-License.txt
	README.txt
	forge-1.7.2-10.12.1.1103-changelog.txt
Merge branch 'master' of https://github.com/ironhammer354/SteamTech

Conflicts:
	CREDITS-fml.txt
	LICENSE-fml.txt
	MinecraftForge-Credits.txt
	MinecraftForge-License.txt
	README.txt
	forge-1.7.2-10.12.1.1103-changelog.txt
Removal