Merge pull request #2 from leonardothibes/develop

Develop
Merge branch 'master' of github.com:leonardothibes/Tbs-Log
Merge branch 'hotfix/phpunit'
Merge branch 'develop'
update
Merge branch 'master' into feature/travis
updating travis file to use Makefile