initial commit
merge of initial commits on github and locally