Commit before pulling.
Merge branch 'master' of https://github.com/AlincoRecoders/GearFoundry

Conflicts:
	GearFoundry/PortalGear.cs
Trying another commit
Icons on portal hud.