modified:   ../.gitmodules
new file:   zsh-syntax-highlighting
modified:   ../.gitmodules
new file:   zsh-history-substring-search
modified:   ../.gitmodules
deleted:    zsh-history-substring-search
deleted:    zsh-syntax-highlighting
modified:   ../.gitmodules
modified:   ../ranger/ranger.cfolder/bookmarks
modified:   ../ranger/ranger.cfolder/history
new file:   zsh-syntax-highlighting
modified:   ../.gitmodules
new file:   zsh-history-substring-search
	modified:   ../ranger/ranger.cfolder/bookmarks
modified:   ../.gitmodules
deleted:    zsh-history-substring-search
deleted:    zsh-syntax-highlighting
modified:   ../.gitmodules
modified:   ../ranger/ranger.cfolder/bookmarks
Signed-off-by: HerrNieschnell <registerbn@gmail.com>

modified:   ../.gitmodules
new file:   zsh-history-substring-search
modified:   ../ranger/ranger.cfolder/bookmarks
modified:   ../.gitmodules
deleted:    zsh-history-substring-search
modified:   .gitmodules
deleted:    git/aliases.zsh
deleted:    git/completion.zsh
modified:   i3/i3.symlink/config
deleted:    pacman/aliases.zsh
deleted:    private/aliases.zsh
deleted:    private/env-vars.zsh
modified:   ranger/ranger.cfolder/bookmarks
modified:   ranger/ranger.cfolder/history
deleted:    system/aliases.zsh
deleted:    system/env.zsh
deleted:    system/grc.zsh
deleted:    system/keys.zsh
deleted:    system/path.zsh
deleted:    texlive/aliases.zsh
deleted:    texlive/path.zsh
deleted:    vim/aliases.zsh
deleted:    zsh/aliases.zsh
deleted:    zsh/cd.zsh
deleted:    zsh/compl.zsh
deleted:    zsh/completion.zsh
deleted:    zsh/config.zsh
deleted:    zsh/fpath.zsh
deleted:    zsh/history.zsh
deleted:    zsh/io.zsh
deleted:    zsh/keys.zsh
deleted:    zsh/prompt.zsh
deleted:    zsh/window.zsh
new file:   zsh/zsh-history-substring-search
new file:   zsh/zsh-syntax-highlighting
modified:   zsh/zshrc.symlink
new structure
new file:   git/zsh-config/aliases.zsh
new file:   git/zsh-config/completion.zsh
new file:   pacman/zsh-config/aliases.zsh
new file:   private/zsh-config/aliases.zsh
new file:   private/zsh-config/env-vars.zsh
new file:   system/zsh-config/aliases.zsh
new file:   system/zsh-config/env.zsh
new file:   system/zsh-config/grc.zsh
new file:   system/zsh-config/keys.zsh
new file:   system/zsh-config/path.zsh
new file:   texlive/zsh-config/aliases.zsh
new file:   texlive/zsh-config/path.zsh
new file:   vim/zsh-config/aliases.zsh
new file:   zsh/prompt-themes/prompt-pure.zsh
new file:   zsh/prompt-themes/prompt.zsh
new file:   zsh/zsh-config/aliases.zsh
new file:   zsh/zsh-config/cd.zsh
new file:   zsh/zsh-config/compl.zsh
new file:   zsh/zsh-config/completion.zsh
new file:   zsh/zsh-config/config.zsh
new file:   zsh/zsh-config/fpath.zsh
new file:   zsh/zsh-config/history.zsh
new file:   zsh/zsh-config/io.zsh
new file:   zsh/zsh-config/keys
new file:   zsh/zsh-config/keys.zsh
new file:   zsh/zsh-config/prompt-pure.zsh
new file:   zsh/zsh-config/window.zsh
modified:   zsh-config/prompt-pure.zsh
modified:   zshrc.symlink
modified:   zsh/zsh-config/prompt-pure.zsh
Merge branch 'master' into zsh-config

Conflicts:
	ranger/ranger.cfolder/bookmarks
	ranger/ranger.cfolder/history

modified:   ranger/ranger.cfolder/bookmarks
modified:   ranger/ranger.cfolder/history
modified:   script/bootstrap
deleted:    texlive/tex.symlink/latex/styles/bn-fthesis.sty
deleted:    texlive/tex.symlink/latex/styles/bn-thesis.sty
Merge branch 'zsh-config'