init commit, add config.fish
Merge commit '92b03c62db41b00f99921238db1938d6aab25654'