amarillo!!
Merge remote-tracking branch 'origin/master'
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 91e0a54c96c16c269d298f1bc26e1111373ba287.
sdsdsd
Revert "sdsdsd"

This reverts commit 7970e902ed10ed043e9f821d54cbb6e063988b24.
Merge remote-tracking branch 'origin/master' into Dario

Conflicts:
	app/views/articles/new.html.erb
sdsd

sdsd
xcvxcv
article New
Merge branch 'master' of https://github.com/disla/Blog-definitivo