removed a bunch of unnecessary files
git ignore merge