initial commit
initial merging with github initial stuff