fixed vinnare
solve merge conflict
fixed css for welcome page
fixed merge conflict
push after the lection