initial test import
Merge branch 'master' of github.com:juansta/fish-ctrl