upload finished
com
Merge branch 'master' of https://github.com/haftor2410/TransApp

Conflicts:
	TransApp/Views/Video/AddTranslation.cshtml
Merge branch 'Autori-Branch'

Conflicts:
	TransApp/Controllers/VideoController.cs
	TransApp/TransApp.csproj
	TransApp/Views/Video/AddTranslation.cshtml
	TransApp/Views/Video/FileView.cshtml
conflicts resolved