Merge in work edits
Update gitignore
Rm ignored files