Delete .gitignore in Forge-17
Update .gitignore
Delete forge-1.7.2-10.12.0.996-src.zip
Merge branch 'master' of https://github.com/Infamous64/ModularMachines

Conflicts:
	.gitignore