First and follow sets, after merging
Also the files that have that
Merge branch 'master' of https://github.com/dooleykh/CSSE404
because, apparently