commit from 05/15/14 19:48:53. 6 deletions, 4 adds, 10 modifications