Update README.md
Update .gitignore
Update .gitignore
Add code and resources.
Resolve conflict