Rename README.txt to README.md
Update README.md
Merge pull request #2 from githubstudent/update-readme

Rename README.txt to README.md
Update .gitignore
Merge remote-tracking branch 'upstream/master'