Commits

Bob Garwood authored cc70cc0ed65 Merge
handled merge conflicts, added another task

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut