gangarunnsblabal
Merge branch 'Alexander_V2' of github.com:WikiText/WikiSubs into Asta
html i subtitle view
Merge branch 'Asta', remote-tracking branch 'origin'
Merge branch 'master' of github.com:WikiText/WikiSubs
Merge branch 'master' of github.com:WikiText/WikiSubs
tvo ny view
Merge branch 'master' of github.com:WikiText/WikiSubs
Merge branch 'master' into Asta
Merge branch 'master' of github.com:WikiText/WikiSubs into Alexander_V2
allskonar dotari
asa var ad laga conflict i home index og layout
subtitle vview model og laga repo
Merge branch 'master' of github.com:WikiText/WikiSubs
laga conflict
laga laga
omerkilegt
Merge branch 'master' of github.com:WikiText/WikiSubs

Conflicts:
	WikiSubsWebApp/Views/Home/Index.cshtml
Mediacontroller...
.mdf og .ldf file-ar komu í changes þegar ég skipti í master og til baka