update
Merge branch 'master' of https://github.com/JuL1205/WearBong

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin
	local.properties
	mobile/src/main/java/com/gdg/wearbong/MyActivity.java
	wear/src/main/java/com/gdg/wearbong/MyActivity.java
	wear/src/main/res/layout/rect_activity_my.xml
	wear/src/main/res/layout/round_activity_my.xml