Merge branch 'master' into Cole
syncing cole's branch locally on john's computer

syncing cole's branch locally on john's computer
syncing cole's branch locally on john's computer

syncing cole's branch locally on john's computer
Merge branch 'Cole' of https://github.com/GigaBots/Dashboard_Mindstorm into Cole

Conflicts:
	js/jquery.min.js
	js/main.js
syncing cole's branch on john's computer

syncing cole's branch on john's computer
syncing cole's branch on john's computer

syncing cole's branch on john's computer
syncing cole's branch on john's computer

syncing cole's branch on john's computer
finished syncing cole's branch on john's computer

finished syncing cole's branch on john's computer
finished syncing cole's branch on john's computer

for real
Merge branch 'John'
extend bottom margin
Merge branch 'master' into Cole
Merge branch 'Cole'
textEditor analyze multiple lines of input code

Can now handle any number of lines that the user inputs. <br> tags
ignored.
Merge branch 'Cole'
Merge branch 'master' into Cole
add comments for developers
Merge 'John', fixed conflicts, and a background

A subtle space background! Opinions?

Fixed conflicts:
	js/main.js
create array
Merge branch 'master' of https://github.com/GigaBots/Dashboard_Mindstorm

Conflicts:
	js/main.js