...
.............
Merge branch 'master' of https://github.com/akyle9/HackAlarm

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	app/src/main/java/com/klee2011/hackalarm/MyActivity.java