commit from 05/15/14 18:39:06. 2 deletions, 1 adds, 4 modifications