Teste2
Merge branch 'develop2'

Conflicts:
	css/style.css