Add JUnit dependency
Add .gitignore file.
Resolve merge conflict.