Actualizado
Merge branch 'master' of https://github.com/ajmarquez/GitCargo

Conflicts:
	RubyGlass/views/timeline_item.haml