gitignore for merge
deleted everthing for a clean merge
gitignore for merge