Fixed a merge
Merge branch 'master' of https://github.com/itu-anso/PublishIT

Conflicts:
	PublishITService/PublishITServiceTests/ServiceTests.cs
The upload function is now working properly