added mocha testing
fixing .gitignore merge issue