local edit of commands.txt
Merge remote-tracking branch 'origin/add-credits' into add-credits

Conflicts:
	commands.txt