Test 1 in travis.yml
Merge branch 'master' of github.com:hilmario10/Sidannaverkefni