commit 2
Merge branch 'master' of https://github.com/lucianaheuko/teste

Conflicts:
	index.html