Fixed an empty(0) bug
Fixed an empty(0) bug
Syntax error
Syntax error
Added client.php to gitignore
Fixed conflict in gitignore
Added merlin.log to .gitignore
Merge branch 'master' of github.com:vduglued/merlinphp