God help me
I DON'T EVEN CARE ANYMORE.
stupid extra file
Fixed layouts

bmp to png
Merge branch 'master' of https://github.com/CrescendoTeam/Crescendo

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

yeh