Began to implement editor functionality
Merge branch 'master' of github.com:deanrobertcook/TextEditor

Conflicts:
	source/Controller.js