Enabled file watching during development
Removed .gitkeep files that caused conflicts during file merging