Explicación de directiva location
Merge branch 'master' of github.com:Stolz/linux-cheat-sheets

Conflicts:
	nginx.md