First commit
adding initial commit.
fixed merge