blob upload
Merge branch 'master' of https://github.com/COTB/k94warriors

Conflicts:
	K94Warriors/Controllers/DogController.cs
	K94Warriors/K94Warriors.csproj
no message