Lista inicial de recordatorios
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	
	No hagais push de ningun fichero autogenerado