PSR2
Add package Fileconflict + code coverage improvement
Merge pull request #8 from fezfez/alpha-0.1

Alpha 0.1