imagens faltando
Merge remote-tracking branch 'origin/master'

Conflicts:
	.rvmrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.generators
	public/images/slider.png
Merge remote-tracking branch 'origin/master'
commit gigante