Merge pull request #1 from lwade/master

Move content with some minor updates
Update README.md
Update README.md
Merge remote-tracking branch 'upstream/master'