Ignorando del versionamiento la carpeta uploads
Merge branch 'ver2014' of github.com:estrategasdigitales/onisuzume into ver2014