Filling empty repo
fixed .gitignore conflict