initial commit
merge github stuff