Initial commit
Added README
Resolved conflict