episodeview..
Merge branch 'master' of github.com:WikiText/WikiSubs into Alexander_V4
Tengja saman EpisodeView og SubtitleView
Merge remote-tracking branch 'origin' into subtitles
epViewv
Merge branch 'master' of github.com:WikiText/WikiSubs into Alexander_V4
fixing conflict
Merge branch 'master' of github.com:WikiText/WikiSubs into HeidaBranch