Added inclass assignment 2, due 10/14/2014