merge
Merge branch 'master' of https://github.com/Toam/dotfiles
Merge branch 'master' of https://github.com/Toam/dotfiles
Merge branch 'master' of https://github.com/Toam/dotfiles
Merge branch 'master' of https://github.com/Toam/dotfiles
Remove zen-room & add vim-markdown