init commit
Added Mocha Testing File
Fixed Merges