Assignment 2 changes 12-6-2014 4:02pm