Cualquier cosa.
Estamos aprendiendo.
algo
Merge branch 'master' of git://github.com/jamescr/spreads into jamescr-master

Conflicts:
	ticoteam.txt