conditions
con
Changing imports for code inspection
Merge branch 'master' of https://github.com/SpiderPigs/sidannarverkefni
renamed e2e_test_travis to e2e_test
fix
Merge branch 'master' of github.com:SpiderPigs/sidannarverkefni
Merge branch 'master' of github.com:SpiderPigs/sidannarverkefni
fixed small errors
Making code style more consistent
Merge branch 'master' of https://github.com/SpiderPigs/sidannarverkefni
Fixing packages in selenium tests
Adding comments to selenium tests
Fixed refreshing site in Firefox.
Fixed failure on Travis when testing.
Fixed failure on Travis when testing v2.
Fixed failure on Travis when testing v2.
fixed a tie test and removed a duplicate