我就随便试试→_→
→_→
Merge branch 'master' of https://github.com/daniyuu/GiveMeFive

Conflicts:
	Givemefive/.gradle/1.10/taskArtifacts/cache.properties.lock
	Givemefive/.gradle/1.10/taskArtifacts/fileHashes.bin
	Givemefive/.gradle/1.10/taskArtifacts/fileSnapshots.bin
	Givemefive/.gradle/1.10/taskArtifacts/outputFileStates.bin
	Givemefive/.gradle/1.10/taskArtifacts/taskArtifacts.bin
	Givemefive/.idea/workspace.xml