Broke during conversation.
Merge branch 'master' of https://github.com/dkschill/HS201

Conflicts:
	src/HS201.FinalAssignment.Core/AutoMapperStuff.cs
	src/HS201.FinalAssignment.Core/Domain/Mappings/ConferenceMapping.cs
	src/HS201.FinalAssignment.Core/Features/Conferences/ConferenceEditModel.cs
	src/HS201.FinalAssignment.Core/Features/Conferences/ConferenceEditModelHandler.cs
	src/HS201.FinalAssignment.Core/Features/Conferences/ConferenceEditModelValidator.cs
	src/HS201.FinalAssignment.Core/Features/Conferences/ConferenceIndexModel.cs
	src/HS201.FinalAssignment.Core/HS201.FinalAssignment.Core.csproj
	src/HS201.FinalAssignment.Core/Infrastructure/IConferenceRepository.cs
	src/HS201.FinalAssignment.Core/Infrastructure/ISessionRepository.cs
	src/HS201.FinalAssignment.Core/Properties/AssemblyInfo.cs
	src/HS201.FinalAssignment.Core/packages.config
	src/HS201_FinalAssignment.sln
	src/HS201_FinalAssignment/Controllers/ConferencesController.cs
	src/HS201_FinalAssignment/Data Access/NhConfiguration.cs
	src/HS201_FinalAssignment/DependencyResolution/IoC.cs
	src/HS201_FinalAssignment/HS201.FinalAssignment.csproj
	src/HS201_FinalAssignment/Views/Conferences/Index.cshtml