Merge branch 'master' into Cole
Run button, previous code displayed above current
rename "i" so textEditor can use it

rename variables “i” and “j” to allow textEditor to use these two
variables without interfering with main.js code.
Merge branch 'Cole'

Conflicts:
	css/windowStyles.css
	index.html