renamed e2e_test_travis to e2e_test
Merge branch 'master' of github.com:SpiderPigs/sidannarverkefni
Merge branch 'master' of github.com:SpiderPigs/sidannarverkefni