commit from 05/17/14 19:05:43. 7 deletions, 0 adds, 5 modifications