One bug is not by ls for ls -a
Merge remote-tracking branch 'upstream/cs100-2014fall' into cs100-2014fall