Techduto-2014-12-09-1305

sem comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css