add igore file
Merge remote-tracking branch 'upstream/master'
 #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