5/2/13
Merge branch 'master' of https://github.com/AlincoRecoders/GearFoundry
5/2/13 reconciled