Adding content for phase 4 of the lab, tuning .gitattributes
Adding 2 new questions
Merge remote-tracking branch 'upstream/master'
update