Scaffolding.
Added .gitignore file.
Fixed merge conflict.