first commit
fixed gitignore conflict