changing names
readme fix
Merge branch 'master' into nickbranch