CommitConflict
Merge branch 'master' of github.com:C0ldF0x/EAPLI_EXAMPLE

Conflicts:
	Fixed: estudo_eapli.txt