Update README
Add GitHub username
Merge branch 'master' into linux-server