quick update so I can sync
Merge branch 'master' of https://github.com/JacobMcKim/TED

Conflicts:
	TED/bin/Command.class
Merge branch 'master' of https://github.com/JacobMcKim/TED