nothin
adding gitignore to project
fixing conflicts