Merge branch 'master' into Cole
function to change height of textEditor

determine what height of textEditor should be based on how many
previous elements are in textEditor array
to do for tomorrow
Merge branch 'Cole'
click textEditor to disable hotkeys
Merge branch 'Cole'
Merge branch 'master' of https://github.com/GigaBots/Dashboard_Mindstorm

Conflicts:
	index.html
conflict resolution
Merge branch 'master' into Cole
Merge branch 'John'
Merge branch 'John'
Merge branch 'master' of https://github.com/GigaBots/Dashboard_Mindstorm
some css changes for the html page

add scrollbars by default (hopefully they work on iPhone and android
alright)
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
conflict resolution
Merge branch 'master' into Cole
finagle footer stuff
Merge branch 'Cole'