update readme
push and pull
rename folders
fixed conflicts