Merge pull request #1 from rianders/master

Update README.md
Update README.md
Merge pull request #1 from capstoneclass/master

pick up live edit