Fix gitignore
Lection 6 and half 7
Fix conflicts