Inital Commit
Update README.md
Merged some conflicts