untracked composer
readded gitignore
conflict with gitoignore fixed