Describe resolution of mocha/chai conflicts
Describe resolution of mocha/chai conflicts

Add description of how to resolve bower.json conflicts for Mocha/Chai.  Choosing the higher version gives bower errors.
trentmwillis/ember-cli-mocha,cowboyd/ember-cli-mocha,zenefits/ember-cli-mocha,switchfly/ember-cli-mocha,switchfly/ember-cli-mocha,lazybensch/ember-cli-mocha,trentmwillis/ember-cli-mocha,ember-cli/ember-cli-mocha,cowboyd/ember-cli-mocha,HeroicEric/ember-cli-mocha,zenefits/ember-cli-mocha,lazybensch/ember-cli-mocha,blimmer/ember-cli-mocha,HeroicEric/ember-cli-mocha,rwjblue/ember-cli-mocha,ember-cli/ember-cli-mocha,blimmer/ember-cli-mocha