Merge branch 'master' of /Library/WebServer/Documents/gdlestradicional with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/scripts/display.js
Tweet destacado