Updated code - second time around on this one

Submitting code for Project 1