edit framaypupi
Merge branch 'master' into yupi

Conflicts:
	framayupi.txt