initial commit
add files to ignore
merge with remote origin