First!!
Merge branch 'master' of https://github.com/Gilligan128/Maelstrom

Conflicts:
	Maelstrom.CharacterTracker.Web/Controllers/OriginsController.cs
	Maelstrom.CharacterTracker.Web/Maelstrom.CharacterTracker.Web.csproj
Second!
Fixed Source control errors