Updated Tests for Week2
Merge branch 'master' of github.com:allen-dolph/coursera-programming-android

Conflicts:
	week2/ActivityLab/.gradle/1.9/taskArtifacts/cache.properties.lock
	week2/ActivityLab/.gradle/1.9/taskArtifacts/fileHashes.bin
	week2/ActivityLab/.gradle/1.9/taskArtifacts/fileSnapshots.bin
	week2/ActivityLab/.gradle/1.9/taskArtifacts/outputFileStates.bin
	week2/ActivityLab/.gradle/1.9/taskArtifacts/taskArtifacts.bin
	week2/ActivityLab/.idea/workspace.xml
	week2/ActivityLab/app/build.gradle
	week2/ActivityLab/app/build/apk/app-debug-unaligned.apk
	week2/ActivityLab/app/build/libs/app-debug.dex

Merged Week2 Test changes