teste
teste2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Final/index.haml
	Final/index.html