adding 3.2
fdf
Merge branch 'master' of https://github.com/renatoquesada/elgranrenato

Conflicts:
	octocat.txt