Totally unimportant commit that students should completely ignore ;)
Merge remote-tracking branch 'upstream/master'
Added link for quiz2