Forgot to commit
Merge branch 'master' of cnnet.se:liu
Forgot to merge, hope it is fine
Testing
Merge branch 'master' of cnnet.se:liu
merging
Merge branch 'master' of cnnet.se:liu
merger
this stopped working for some reason, but it did at one point. Reboot?