Added the right one
Changed stupid thing
Merge branch 'master' of github.com:NemoPrime/TextEditor

Conflicts:
	TextMain.java