office - after delete
office - gitignore
office - pulled - also resolved conflicts of .gitignore
office - added many things