ignore files
Merge branch 'branch_test'
rebase_continue
Merge branch 'master' of https://github.com/fhdone/600w
rebase 2