add a file
add setup.py
test commit

fix bug:
1. iiiii
2. ioooooo
3. pppjdiek
3th commit
Merge branch 'master' of github.com:t7/testmerge