Update README.md
Merge pull request #1 from csc301-fall2014/dev

Update README.md