Update README.md
Merge pull request #1 from objas/dev

Dev
Merge pull request #2 from objas/master

Merge to upstream
figuring out upstream merge
set password dev; token check needed