Changes
Merge branch 'editor' of github.com:CS3141-Team-Software/Programmander into editor

Conflicts:
	editor/src/editorWindow/EditorWindow.java