initial commit
Merge branch 'master' of https://github.com/zeu5/Crescendo

Conflicts:
	.gradle/1.6/taskArtifacts/cache.properties
	.gradle/1.6/taskArtifacts/fileHashes.bin
	.gradle/1.6/taskArtifacts/fileSnapshots.bin
	.gradle/1.6/taskArtifacts/outputFileStates.bin
	.gradle/1.6/taskArtifacts/taskArtifacts.bin
	.idea/gradle.xml
	.idea/misc.xml
	.idea/workspace.xml
	Crescendo.iml
	Crescendo/Crescendo-Crescendo.iml
	Crescendo/src/main/java/com/crescendo/crescendo/MainActivity.java
	Crescendo/src/main/res/layout/activity_main.xml
	Crescendo/src/main/res/values-sw600dp/dimens.xml
	Crescendo/src/main/res/values-sw720dp-land/dimens.xml
	Crescendo/src/main/res/values-v11/styles.xml
	Crescendo/src/main/res/values/dimens.xml
	Crescendo/src/main/res/values/strings.xml
	Crescendo/src/main/res/values/styles.xml

Rebuild in Eclipse
Rebuild in Eclipse