Edited readme
Merge origin/master