Merge branch 'master' of https://github.com/JavaCafe01/exa into JavaCafe01-master

Change a bunch of the existing shell-related icons to the new Unicode escape.
# Conflicts:
#	src/output/icons.rs

src/output/icons.rs

@@ -156,11 +156,11 @@ fn icon(file: &File) -> char {
             "cab"       => '\u{e70f}',
             "bat"       => '\u{e70f}',
             "cmd"       => '\u{e70f}',
-            "sh"        => '\u{e795}',
-            "bash"      => '\u{e795}',
-            "zsh"       => '\u{e795}',
-            "fish"      => '\u{e795}',
-            "csh"       => '\u{e795}',
+            "sh"        => '\u{f489}',
+            "bash"      => '\u{f489}',
+            "zsh"       => '\u{f489}',
+            "fish"      => '\u{f489}',
+            "csh"       => '\u{f489}',
             "ini"       => '\u{e615}',
             "toml"      => '\u{e615}',
             "cfg"       => '\u{e615}',