Added .gitignore files to empty directories to force into git
Merge