Merged git ignore and added DS Store and CodeKit ignore