initial commit
merge conflicts with GitHub defaults