Don't commit the build directory.
Don't commit the build directory.
Add build directory to .gitignore.
Don't commit .gradle folder.
Merge branch 'master' into sharing-is-caring

Conflicts:
	.gradle/1.6/taskArtifacts/fileHashes.bin
	.gradle/1.6/taskArtifacts/fileSnapshots.bin
	.gradle/1.6/taskArtifacts/outputFileStates.bin
	.gradle/1.6/taskArtifacts/taskArtifacts.bin
Remove .iml from repo and change .gitignore.
Merge branch 'master' into sharing-is-caring