WE MADE IT! YEAH WE MADE IT!
Merge branch 'master' of https://github.com/CrescendoTeam/Crescendo

Conflicts:
	src/com/crescendo/crescendo/texteditor.java