Some custom settings I don't even remember
Merge branch 'master' of github.com:SanchezSobrino/dot-files

* 'master' of github.com:SanchezSobrino/dot-files:
  Fixed templates

Conflicts:
	.emacs.d/.emacs
	.emacs.d/config/minimal.cfg.el