message: Resolved merge.
diff: -# generator-feathers-plugin [![Build Status](https://secure.travis-ci.org/Glavin001/generator-feathers-plugin.png?branch=master)](https://travis-ci.org/Glavin001/generator-feathers-plugin)
  +# generator-feathers-plugin [![Build Status](https://travis-ci.org/Glavin001/generator-feathers-plugin.png?branch=master)](https://travis-ci.org/Glavin001/generator-feathers-plugin)
  > A [Yeoman](http://yeoman.io) generator for initializing new [Feathersjs](https://github.com/feathersjs) plugins.
  