More rules!
Merge branch 'master' of https://github.com/Skabbkladden/TDT4250.git