removing folders that got brought in from the master branch in the last pull I had to do to resolve conflicts