Initial commit
Fixing README conflicts