Changed README
Merged conflict with remote
Changed README