More changes
Fixed conflict

Conflicts:
	Question3/SolutionOnGitHub.R