commit 3
Merge branch 'develop' of https://github.com/diegospotti/teste into develop

Conflicts:
	default.html