Techduto-2014-12-17-1819

organizacao das paginas es
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css