Updated Readme and Setup
Resolved Readme Conflict