Refactored files
Merge branch 'master' of https://github.com/colindj1120/CourseEra_Android_Development

Conflicts:
	Projects/Lab 2/ActivityLabTest/bin/classes/course/labs/activitylab/test/BuildConfig.class
	Projects/Lab 2/ActivityLabTest/bin/classes/course/labs/activitylab/test/Test1.class
	Projects/Lab 2/ActivityLabTest/bin/classes/course/labs/activitylab/test/Test2.class
	Projects/Lab 2/ActivityLabTest/bin/classes/course/labs/activitylab/test/Test3.class