Project skeleton setup
Fix .gitignore file conflict