Initial commit
Resolving conflict in README