removed need for custom html file
added try on json parse
switched to lib not here
got sinon working
stash changes breaking
added initial test
added stash
added tests moved unfinished tests to backup
got router tests working
added them
Merge branch 'RC1/mocha' of github.com:motherjones/smokejs into RC1/mocha

Conflicts:
	js/api.js
	package.json
	test/all.js
	test/api.js
	test/router.js
removed all unnessary
make api tests run, still gotta squash that error
Merge branch 'RC1/mocha_merge' of github.com:motherjones/smokejs into RC1/mocha_merge
stashed move ad to test/ad.js
Merge branch 'RC1/mocha_merge' of github.com:motherjones/smokejs into RC1/mocha_merge
wat is this even idk
added changes to mocha merge
make ads use mocha tests
stasheed changes