whitespace
removed unneeded files and updatyed gitignore
updated .gitignore
merge fix