add .gitignore
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
refactor phpunit.xml.dist location
Merge pull request #22 from erivello/patch-3

refactor phpunit.xml.dist location