unmerged piece from previous merge
Removed bad files and add .gitignore