solve mergeconflict in readme and gitignore
Merge pull request #2991 from fritzing/test

deleted fritzing folder with filter-branches