Merge branch 'Alexander_V2'
Merge branch 'master' of github.com:WikiText/WikiSubs
Merge branch 'master' of github.com:WikiText/WikiSubs
Merge branch 'Alexander_V2'
HomeController og MediaController með rétta DB tenginu