Config file is okey for scrren size.
Changed git ignore file.
Merged conflict
Merged conflcit