Initial project commit
merged conflicts in the .gitignore file