Merge pull request #1 from MaksimPanasau/master

Add lol.
add second line
resolved conflict
Merge branch 'MaksimPanasau-master'