changes
rge branch 'master' of github.com:4fab/TED_Final

Conflicts:
	src/Editor.java