estes edit map
Merge pull request #25 from CrouseMatthew/estes

estes edit map
final touches
final
Merge pull request #26 from CrouseMatthew/Matthew

Matthew