Dylan merger
Merge branch 'RSherman_LEX'
Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave