versão 3

version
Merge branch 'master' of https://github.com/Adilmar/BlaBla-UFU

Conflicts:
	config.xml
	images/Thumbs.db
	index.html