Rewrote the scheme to fit our (Sebastian's) new design
Merge branch 'tourney' of github.com:andak/tdt4260 into tourney