Initial commit
Resolved conflict in README