commit from 12/15/13 15:20:00. 2 deletions, 2 adds, 5 modifications