Abstract
Merge branch 'tourney' of ssh://github.com/andak/tdt4260 into tourney