removed unecessary file
Merge branch 'master' into feature/hhvm