Merge branch 'master' of github.com:santiagobasulto/dotemacs
Customizations + template
Added bookmarks to gitignore
Solved conflicts