update
Merge branch 'master' of https://github.com/stinger907/OOPTeamwork

Conflicts:
	AlexandreDumasOOP/AlexandreDumasOOP.Common/AlexandreDumasOOP.Common.csproj
	AlexandreDumasOOP/AlexandreDumasOOP.Common/Characters/Hero.cs