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.
Merge pull request #11 from clekstro/patch-1

Describe resolution of mocha/chai conflicts