Added hand-in 2
Minor final adjustments for Handin 2