Final working commit, submitted on 1/2/13

CG2007 mini project submission quality code