redoing legend
Merge branch 'rearrange' of https://github.com/knutesten/tdt4900 into rearrange