initial commit

merging into master