asdf
asd
Merge branch 'master' of https://github.com/MihaiLupoiu/documentoNagios

Conflicts:
	basememoria.pdf