ver 0.2

header.h added
Merging