my prototype
Merge branch 'prototype' of github.com:jappeace/hw-isgp-kbs into prototype

Conflicts:
	bitmap/bitmap/bitmap.cpp
df
C

C
D
C
D
C
C
D
D
D
C
C
C
C
C
C
C
C
C
C
C
C
C
C
B
B