no-op for pull request
jbnew
JBNew
Dos2unix files that didn't get converted before
Minor comments added/edited to force recognition of dos2unix
Delete old, unused files
Merge branch 'master' into joe

Conflicts:
	.gitignore
	.htaccess
	.travis.yml
	README.md
	index.html
	js/core/eden.js
	js/core/runtime.js
	js/edenui.js
	models/parsingEMPE2/buggyparsingPres.js-e
	models/parsingEMPE2/funcGrammar.js-e
	models/parsingEMPE2/funcTransitionsPicture.js-e
	models/parsingEMPE2/graphc.js-e
	models/parsingEMPE2/jspeSeparate.js-e
	models/parsingEMPE2/lexicalAnalysisc.js-e
	models/parsingEMPE2/mkeden.txt
	models/parsingEMPE2/moveNodes.js-e
	models/parsingEMPE2/parsingModelRun.js-e
	models/parsingEMPE2/parsingPres.js-e
	models/parsingEMPE2/parsingPres.js-e~
	models/parsingEMPE2/parsingPres0.js-e
	models/parsingEMPE2/parsingc.js-e
	models/parsingEMPE2/run.js-e
	models/parsingEMPE2/syntaxdirectedtranslationc.js-e
	oldindex.html
	package.json
	plugins/canvas-html5/inputbox2.js-e
	plugins/input-dialog/interpreter.css
	plugins/input-dialog/interpreter.js
	plugins/input-dialog/newInterpreter.js
	plugins/input-dialog/old/interpreter.js
	plugins/menu-bar/menu-bar.js
	qunit_tests.js
Merge pull request #23 from EMGroup/joe

Placeholder pull request for merging "joe" branch