new version
new version
Merge branch 'master' of github.com:rbrazileiro/contosdeifa

Conflicts:
	index.html
reconect index.html