squahed commits on hlao002
Merge pull request #594 from hlao002/cs100-2014fall

squahed commits on hlao002