editing CrashCourseApp class
resolve merge