Primeiro Commit
Merge origin/master

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php