Merge branch 'master' into Cole
removed unneccessary lines
Merge branch 'master' into Cole
removed textEditor evals from update function

textEditor eval now child of “beginGame”
remove DialA in textEditor
Merge branch 'John'
addition of background space image

add and shade background in body element
Merge branch 'Cole'

Conflicts:
	js/main.js
resolve conflict
Merge branch 'master' into Cole
formatting changes

formatting changes
textEditor to store current unsubmitted code

textEditor can now maneuver down to any code that hasn’t been submitted
by the user
Merge branch 'Cole'

Conflicts:
	js/main.js
resolve conflict
fixed some positioning in dashboard

fixed some positioning in dashboard
fixed resume overlay size

fixed resume overlay size
Merge branch 'master' into John