Kelli 6/30 changes
Merge branch 'master' of github.com:AdlerFarHorizons/CutDownSystem

Merge Kelli and Rachel updates