updated readme now that i have multiple branches
Merge branch 'master' into desktop