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

# Conflicts:
#	src/output/icons.rs

src/output/icons.rs

@@ -184,6 +184,7 @@ fn icon(file: &File) -> char {
             "groovy"    => '\u{e775}',
             "iso"       => '\u{e271}',
             "lock"      => '\u{f023}',
+            "swift"     => '\u{e755}',
             _           => '\u{f016}'
         }
     } else {