Initial commit
solved merge conflict readme