updated 4/ 11/2014
updated 4/14/2014
updated 4/14/2014
updated 4/14/2014
updated 4/14/2014
updated 4/14/2014
removed excess
removed more excess
Merge latest.cpp
pp02 graded 2014.04.16