hello test

hello in readme
Merged with upstream/master
Update README.md
Merge remote-tracking branch 'upstream/master'
added sync directions to README
getting rid of conflict
getting rid of the conflict