from igor
conflict resolve
Merge branch 'master' of https://github.com/itstep2013autumnEvening/Justforfun
add Igor
FUUUUUUN
utf-8
Lol
1 from dolgij
conflict resolve
lll
1 dets
sadhjf
1 from HZ
gfhdh
conflict resolve
2 from dolji
Merge branch 'master' of https://github.com/itstep2013autumnEvening/Justforfun
Merge branch 'master' of https://github.com/itstep2013autumnEvening/Justforfun
sdag
3 from dolji