Assignment 3, 20150521

Solution... I hope so