added phpunit
added travis
Merge remote-tracking branch 'origin/master'