Merge accidental branch into nkbranch

Deleted some files, added .gitignore