Fixed layouts

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

Conflicts:
	res/layout/activity_main.xml
	src/com/crescendo/crescendo/texteditor.java

stupid merging