change theme, add toolbar, and code format
test
Merge branch 'delete_build'

Conflicts:
	.gradle/2.1/taskArtifacts/cache.properties
	.gradle/2.1/taskArtifacts/cache.properties.lock
	.gradle/2.1/taskArtifacts/fileHashes.bin
	.gradle/2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.1/taskArtifacts/outputFileStates.bin
	.gradle/2.1/taskArtifacts/taskArtifacts.bin
	.gradle/2.2.1/taskArtifacts/cache.properties
	.gradle/2.2.1/taskArtifacts/cache.properties.lock
	.gradle/2.2.1/taskArtifacts/fileHashes.bin
	.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.2.1/taskArtifacts/outputFileStates.bin
	.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
	.idea/libraries/support_v4_21_0_2.xml
	.idea/workspace.xml
	app/src/main/res/layout/toolbar.xml
merge conflict
merge conflict