#3 make some change on the test branch
Merge pull request #28 from ForceMan88/master

#2222222222222222 comit
dummy commit1
dummy commit2
Trying to solve pull-request problem 1_0_0
Trying to solve pull-request problem 1_0_1
Trying to solve pull-request problem 1_0_2
#22. Resolve conflict.
add igore file
Merge pull request #30 from sergiozt/master

Fixed pull-request problems
Merge remote-tracking branch 'upstream/master'
1
2
 #22. Resolve conflict 2-0-1
add igore file
#22. resolve 2_0_2
#22. 2_0_2
Merge pull request #31 from sergiozt/master

Fixed pull-request problems 2-0-1
push in upstream
push in upstream