Merge branch 'master' of gitlab.com:bebeco/home-folder

.gitconfig

@@ -7,7 +7,7 @@
         st = status
         br = branch
         co = checkout
-        ci = checkin
+        ci = commit
         sst = status -s
         wow = log --all --graph --decorate --oneline --simplify-by-decoration
         spg = log --pretty=format:"%h %s" --graph