Manually merged CSC484_Assignment2.csproj