Merged DRiley into Robs branch -JEuvin
Merge branch 'RSherman_LEX' of https://github.com/itraycer/iTraycer into RSherman_LEX