edited READM after happy
Merge branch 'master' into happy