Added master.md
Merge branch 'master' into noah