added ghost file called gitempty on some folders
merge