Initial commit
solved merge conflict
Added the README file