add bmp to three
aa
master
Merge branch 'three'