Merge pull request #275 from jstod001/cs100-2014fall

updated README.md