GitHub repository: summersky2/FirstWeekOnGitHub_2
Description: First Week On GitHub - Resolve Merge Conflicts