gitignore
- Conflicts
Major style improvemet
Added dummy objects