First commit
Resolved conflicts in gitignore.