Merge branch 'master' of https://github.com/blia/dotfiles
fixing fork issue. WIP
setting up nginx
Merge branch 'master' of https://github.com/blia/dotfiles