Merge branch 'master' into Cole
textEditor allow code input and display error
log codeError
update determines which element is selected
update determines which element is selected
debug textEditor
debug
strengthen textEditor
strengthen textEditor

textEditor only runs onClick of submit button
Merge branch 'Cole'

Conflicts:
	js/main.js