Track phpspec dev-master
Resolve conflict in composer files
Merge pull request #69 from MageTest/feature/track-phpspec-master

Track phpspec dev-master