Alineando, tabulando
Merge branch 'master' of github.com:Makova/mosquito

Conflicts:
	Relato