new ver
new ver
Merge branch 'yanbin' of https://github.com/hibazinga/CS111Fall14 into yanbin
ver 1.1