Ezra? where's the bass all I hear is treble

new layout added
Merge

please work
Merge branch 'master' of https://github.com/CrescendoTeam/Crescendo

Conflicts:
	gen/com/crescendo/crescendo/R.java

cleared R.java BECAUSE OF STUPID CONFLICTS