swap diagonally not allowed, fixed tests for it
Merge branch 'master' of https://github.com/axelsson/agil13_sprint4