Initial Commit
Add a README
Resolved MERGE conflicts