Merging 'master' into atrunner
Merge branch 'master' into atrunner
See below
Merge branch 'atrunner' of https://github.com/spaceconcordia/space-script into atrunner
Identified bug with scheduled command, added dynamic time to simplify testing, added TODOs