change time remaining to fill
Merge branch 'master' of github.com:swillard13/Spaceteam