Alex's spikes for D7
Merge branch 'master' of github.com:davidmerrick/SEALTeamOCHO