Merge branch 'master' of github.com:henrikor/NewsOnRails
fjernet script