new stuff
resolved merge conflict
Revert "added ignore file"

This reverts commit 8fb35dabae71d099ce923adf95f4e166b2ec339c.