modified:   panels/prompt-panel.litcoffee
Merge branch 'master' of https://github.com/charlesjshort/helpless-b3

Conflicts:
	panels/prompt-panel.litcoffee