Updated readme to deatil build instructions
Resolved readme file conflicts