Initial commit
Fixed merge conflict with README