Add textEdit to bottom of Dashboard
Merge branch 'Cole'

Conflicts:
	index.html
	js/main.js
resolve conflict
Merge branch 'master' into Cole