Final commit for 12/2/14 project