ready to grade 4/21/14
ready
Merge pc22 and latest changes