update 11/2/14

2 files to be committed