primeiro commit
Merge branch 'master' of https://github.com/MarcosOcf/log_view

Conflicts:
	README.md