remove all
fix
add test3
Merge branch 'yoman_feature'
Merge pull request #15 from yoman07/master

merging branching