updating the git ignore file
fucking git
merging?